Title: [199037] trunk/Source/WebCore
Revision
199037
Author
[email protected]
Date
2016-04-04 20:56:46 -0700 (Mon, 04 Apr 2016)

Log Message

Don't crash when rendering form controls with Display List Drawing enabled
https://bugs.webkit.org/show_bug.cgi?id=156122

Reviewed by Sam Weinig.

Don't attempt to paint form controls if display-list drawing is enabled, since
doing so attempts to get at a CGContextRef that doens't exist.

* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paint):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (199036 => 199037)


--- trunk/Source/WebCore/ChangeLog	2016-04-05 03:54:49 UTC (rev 199036)
+++ trunk/Source/WebCore/ChangeLog	2016-04-05 03:56:46 UTC (rev 199037)
@@ -1,3 +1,16 @@
+2016-04-04  Simon Fraser  <[email protected]>
+
+        Don't crash when rendering form controls with Display List Drawing enabled
+        https://bugs.webkit.org/show_bug.cgi?id=156122
+
+        Reviewed by Sam Weinig.
+        
+        Don't attempt to paint form controls if display-list drawing is enabled, since
+        doing so attempts to get at a CGContextRef that doens't exist.
+
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::paint):
+
 2016-04-04  Zalan Bujtas  <[email protected]>
 
         CSS Triangles Rendering Regression affecting CSS Ribbons.

Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (199036 => 199037)


--- trunk/Source/WebCore/rendering/RenderTheme.cpp	2016-04-05 03:54:49 UTC (rev 199036)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp	2016-04-05 03:56:46 UTC (rev 199037)
@@ -275,6 +275,9 @@
     if (paintInfo.context().paintingDisabled())
         return false;
 
+    if (UNLIKELY(paintInfo.context().isRecording()))
+        return false;
+
     ControlPart part = box.style().appearance();
     IntRect integralSnappedRect = snappedIntRect(rect);
     float deviceScaleFactor = box.document().deviceScaleFactor();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to