Title: [114000] trunk/Source/WebCore
- Revision
- 114000
- Author
- [email protected]
- Date
- 2012-04-12 10:16:46 -0700 (Thu, 12 Apr 2012)
Log Message
[chromium] Fix threaded compositor HUD crash
https://bugs.webkit.org/show_bug.cgi?id=83778
Patch by Sami Kyostila <[email protected]> on 2012-04-12
Reviewed by James Robinson.
Don't try to read font metrics in threaded compositing mode, since we
currently can't render HUD text with the threaded compositor.
HUD is not testable in WebKit.
* platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:
(WebCore::CCHeadsUpDisplay::drawHudContents):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113999 => 114000)
--- trunk/Source/WebCore/ChangeLog 2012-04-12 17:09:02 UTC (rev 113999)
+++ trunk/Source/WebCore/ChangeLog 2012-04-12 17:16:46 UTC (rev 114000)
@@ -1,3 +1,18 @@
+2012-04-12 Sami Kyostila <[email protected]>
+
+ [chromium] Fix threaded compositor HUD crash
+ https://bugs.webkit.org/show_bug.cgi?id=83778
+
+ Reviewed by James Robinson.
+
+ Don't try to read font metrics in threaded compositing mode, since we
+ currently can't render HUD text with the threaded compositor.
+
+ HUD is not testable in WebKit.
+
+ * platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:
+ (WebCore::CCHeadsUpDisplay::drawHudContents):
+
2012-04-11 Andrey Kosyakov <[email protected]>
Web Inspector: zoom timeline frame on dblclick on the frame bar
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp (113999 => 114000)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp 2012-04-12 17:09:02 UTC (rev 113999)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp 2012-04-12 17:16:46 UTC (rev 114000)
@@ -203,7 +203,10 @@
context->fillRect(FloatRect(0, 0, hudSize.width(), hudSize.height()));
}
- int fpsCounterHeight = m_mediumFont->fontMetrics().floatHeight() + 40;
+ int fpsCounterHeight = 40;
+ if (!CCProxy::implThread())
+ fpsCounterHeight += m_mediumFont->fontMetrics().floatHeight();
+
int fpsCounterTop = 2;
int platformLayerTreeTop;
if (settings().showFPSCounter)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
