Title: [136529] trunk/Source/WebKit/chromium
- Revision
- 136529
- Author
- [email protected]
- Date
- 2012-12-04 10:47:50 -0800 (Tue, 04 Dec 2012)
Log Message
[chromium] fix showFPScounter and showPaintRects not toggleable after page change
https://bugs.webkit.org/show_bug.cgi?id=103937
Patch by Eberhard Graether <[email protected]> on 2012-12-04
Reviewed by Pavel Feldman.
This change avoids updating the WebSettings and uses fields for showFPSCounter and
showPaintRects in WebViewImpl instead, which hold the values between InspectorPageAgent::restore()
and WebViewImpl::setIsAcceleratedCompositingActive().
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::setShowFPSCounter):
(WebKit::WebViewImpl::setShowPaintRects):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
* src/WebViewImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (136528 => 136529)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-04 18:47:31 UTC (rev 136528)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-04 18:47:50 UTC (rev 136529)
@@ -1,3 +1,21 @@
+2012-12-04 Eberhard Graether <[email protected]>
+
+ [chromium] fix showFPScounter and showPaintRects not toggleable after page change
+ https://bugs.webkit.org/show_bug.cgi?id=103937
+
+ Reviewed by Pavel Feldman.
+
+ This change avoids updating the WebSettings and uses fields for showFPSCounter and
+ showPaintRects in WebViewImpl instead, which hold the values between InspectorPageAgent::restore()
+ and WebViewImpl::setIsAcceleratedCompositingActive().
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::WebViewImpl):
+ (WebKit::WebViewImpl::setShowFPSCounter):
+ (WebKit::WebViewImpl::setShowPaintRects):
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+ * src/WebViewImpl.h:
+
2012-12-04 Charlie Reis <[email protected]>
Add FrameLoaderClient::didDisownOpener
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (136528 => 136529)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-04 18:47:31 UTC (rev 136528)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-04 18:47:50 UTC (rev 136529)
@@ -454,6 +454,8 @@
, m_flingModifier(0)
, m_validationMessage(ValidationMessageClientImpl::create(*client))
, m_suppressInvalidations(false)
+ , m_showFPSCounter(false)
+ , m_showPaintRects(false)
{
// WebKit/win/WebView.cpp does the same thing, except they call the
// KJS specific wrapper around this method. We need to have threading
@@ -845,7 +847,7 @@
#endif
m_layerTreeView->setShowFPSCounter(show);
}
- settingsImpl()->setShowFPSCounter(show);
+ m_showFPSCounter = show;
}
void WebViewImpl::setShowPaintRects(bool show)
@@ -854,7 +856,7 @@
TRACE_EVENT0("webkit", "WebViewImpl::setShowPaintRects");
m_layerTreeView->setShowPaintRects(show);
}
- settingsImpl()->setShowPaintRects(show);
+ m_showPaintRects = show;
}
bool WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event)
@@ -4046,8 +4048,8 @@
if (layerTreeViewSettings.showPlatformLayerTree)
loadFontAtlasIfNecessary();
- if (settingsImpl()->showFPSCounter())
- setShowFPSCounter(true);
+ m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
+ m_layerTreeView->setShowPaintRects(m_showPaintRects);
} else {
m_nonCompositedContentHost.clear();
m_isAcceleratedCompositingActive = false;
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (136528 => 136529)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-12-04 18:47:31 UTC (rev 136528)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-12-04 18:47:50 UTC (rev 136529)
@@ -883,6 +883,9 @@
OwnPtr<ValidationMessageClientImpl> m_validationMessage;
bool m_suppressInvalidations;
+
+ bool m_showFPSCounter;
+ bool m_showPaintRects;
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
