Changeset 199769 in webkit

Timestamp:

Apr 20, 2016 1:47:45 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[Cairo] Crash in GraphicsContext::drawFocusRing when painting is disabled
​https://bugs.webkit.org/show_bug.cgi?id=156785

Reviewed by Žan Doberšek.

This happens for example when view state changes to focus and paint is called from
FrameView::updateControlTints() with a graphics context that doesn't have a platform context. Layout test
fast/images/image-map-outline-with-scale-transform.html sometimes crashes because of this.

• platform/graphics/cairo/GraphicsContextCairo.cpp:

(WebCore::GraphicsContext::drawFocusRing): Return early if painting is disabled.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [Cairo] Crash in GraphicsContext::drawFocusRing when painting is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=156785
+
+        Reviewed by Žan Doberšek.
+
+        This happens for example when view state changes to focus and paint is called from
+        FrameView::updateControlTints() with a graphics context that doesn't have a platform context. Layout test
+        fast/images/image-map-outline-with-scale-transform.html sometimes crashes because of this.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::drawFocusRing): Return early if painting is disabled.
+
 2016-04-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -592 +592 @@
 void GraphicsContext::drawFocusRing(const Path& path, float width, float /* offset */, const Color& color)
 {
+    if (paintingDisabled())
+        return;
+
     // FIXME: We should draw paths that describe a rectangle with rounded corners
     // so as to be consistent with how we draw rectangular focus rings.