Title: [124670] trunk/Source/WebKit/chromium
- Revision
- 124670
- Author
- [email protected]
- Date
- 2012-08-03 16:20:14 -0700 (Fri, 03 Aug 2012)
Log Message
[chromium] Remove assert when getting hardware renderingStats in software mode.
https://bugs.webkit.org/show_bug.cgi?id=92325
Patch by Dave Tu <[email protected]> on 2012-08-03
Reviewed by Adrienne Walker.
If a page caused hardware mode to be turned on, then off, the hardware stats are still valid, so we don't need to assert that we're in hardware mode. Checking if the LayerTreeView is null should be sufficient.
* public/WebWidget.h:
(WebWidget):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::renderingStats):
(WebKit::WebViewImpl::paint):
* src/WebViewImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (124669 => 124670)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-03 23:12:58 UTC (rev 124669)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-03 23:20:14 UTC (rev 124670)
@@ -1,3 +1,20 @@
+2012-08-03 Dave Tu <[email protected]>
+
+ [chromium] Remove assert when getting hardware renderingStats in software mode.
+ https://bugs.webkit.org/show_bug.cgi?id=92325
+
+ Reviewed by Adrienne Walker.
+
+ If a page caused hardware mode to be turned on, then off, the hardware stats are still valid, so we don't need to assert that we're in hardware mode. Checking if the LayerTreeView is null should be sufficient.
+
+ * public/WebWidget.h:
+ (WebWidget):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::WebViewImpl):
+ (WebKit::WebViewImpl::renderingStats):
+ (WebKit::WebViewImpl::paint):
+ * src/WebViewImpl.h:
+
2012-08-03 Sheriff Bot <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebWidget.h (124669 => 124670)
--- trunk/Source/WebKit/chromium/public/WebWidget.h 2012-08-03 23:12:58 UTC (rev 124669)
+++ trunk/Source/WebKit/chromium/public/WebWidget.h 2012-08-03 23:20:14 UTC (rev 124670)
@@ -222,8 +222,9 @@
// following the call to instrumentBeginFrame().
virtual void instrumentCancelFrame() { }
- // Fills in a WebRenderingStats struct containing information about the state of the compositor.
- // This call is relatively expensive in threaded mode as it blocks on the compositor thread.
+ // Fills in a WebRenderingStats struct containing information about rendering, e.g. count of frames rendered, time spent painting.
+ // This call is relatively expensive in threaded compositing mode, as it blocks on the compositor thread.
+ // It is safe to call in software mode, but will only give stats for rendering done in compositing mode.
virtual void renderingStats(WebRenderingStats&) const { }
// The page background color. Can be used for filling in areas without
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (124669 => 124670)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-03 23:12:58 UTC (rev 124669)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-03 23:20:14 UTC (rev 124670)
@@ -764,7 +764,6 @@
void WebViewImpl::renderingStats(WebRenderingStats& stats) const
{
- ASSERT(isAcceleratedCompositingActive());
if (!m_layerTreeView.isNull())
m_layerTreeView.renderingStats(stats);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
