Title: [116152] trunk/Source/WebCore
- Revision
- 116152
- Author
- [email protected]
- Date
- 2012-05-04 13:06:14 -0700 (Fri, 04 May 2012)
Log Message
[chromium] CCProxy's shouldn't try to draw if there is no layer renderer
https://bugs.webkit.org/show_bug.cgi?id=85218
Patch by Ian Vollick <[email protected]> on 2012-05-04
Reviewed by Adrienne Walker.
* platform/graphics/chromium/cc/CCThreadProxy.cpp:
(WebCore::CCThreadProxy::scheduledActionDrawAndSwapInternal):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116151 => 116152)
--- trunk/Source/WebCore/ChangeLog 2012-05-04 20:01:17 UTC (rev 116151)
+++ trunk/Source/WebCore/ChangeLog 2012-05-04 20:06:14 UTC (rev 116152)
@@ -1,3 +1,13 @@
+2012-05-04 Ian Vollick <[email protected]>
+
+ [chromium] CCProxy's shouldn't try to draw if there is no layer renderer
+ https://bugs.webkit.org/show_bug.cgi?id=85218
+
+ Reviewed by Adrienne Walker.
+
+ * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+ (WebCore::CCThreadProxy::scheduledActionDrawAndSwapInternal):
+
2012-05-04 Rob Buis <[email protected]>
[BlackBerry] Rendering bmp file as text file when Content-Type:image/x-ms-bmp from apache web server.
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (116151 => 116152)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-05-04 20:01:17 UTC (rev 116151)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-05-04 20:06:14 UTC (rev 116152)
@@ -153,6 +153,8 @@
return false;
if (viewportSize().isEmpty())
return false;
+ if (!m_layerRenderer)
+ return false;
return true;
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (116151 => 116152)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-05-04 20:01:17 UTC (rev 116151)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-05-04 20:06:14 UTC (rev 116152)
@@ -610,6 +610,10 @@
if (!m_layerTreeHostImpl)
return result;
+ ASSERT(m_layerTreeHostImpl->layerRenderer());
+ if (!m_layerTreeHostImpl->layerRenderer())
+ return result;
+
// FIXME: compute the frame display time more intelligently
double monotonicTime = monotonicallyIncreasingTime();
double wallClockTime = currentTime();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
