Changeset 37521 in webkit

Timestamp:

Oct 11, 2008 11:50:21 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-10-11 Alp Toker <​alp@nuanti.com>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=20592
The focus ring is not shown while navigating on some pages

Fix drawFocusRing() so it doesn't depend on the current graphics
state, thus matching other platforms which already work this way.

This patch provides two code paths: one using straight Cairo and
one specialised for the GTK+ port with a more conventional appearance.

Also change focusRingColor() to return a null color, allowing the
focus ring to pick up the style's current color if it isn't overridden
with CSS.

• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::drawFocusRing):
• platform/gtk/TemporaryLinkStubs.cpp: (WebCore::focusRingColor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (2 diffs)
• platform/gtk/TemporaryLinkStubs.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-11  Alp Toker  <alp@nuanti.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=20592
+        The focus ring is not shown while navigating on some pages
+
+        Fix drawFocusRing() so it doesn't depend on the current graphics
+        state, thus matching other platforms which already work this way.
+
+        This patch provides two code paths: one using straight Cairo and
+        one specialised for the GTK+ port with a more conventional appearance.
+
+        Also change focusRingColor() to return a null color, allowing the
+        focus ring to pick up the style's current color if it isn't overridden
+        with CSS.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::drawFocusRing):
+        * platform/gtk/TemporaryLinkStubs.cpp:
+        (WebCore::focusRingColor):
+
 2008-10-11  Dan Bernstein  <mitz@apple.com>
 

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

@@ -3 +3 @@
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Dirk Schulze <vbs85@gmx.de>
+ * Copyright (C) 2008 Nuanti Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -530 +531 @@
         return;
 
-    int radius = (focusRingWidth() - 1) / 2;
-    int offset = radius + focusRingOffset();
-
     const Vector<IntRect>& rects = focusRingRects();
     unsigned rectCount = rects.size();
-    IntRect finalFocusRect;
+
+    cairo_t* cr = m_data->cr;
+    cairo_save(cr);
+    cairo_push_group(cr);
+    cairo_new_path(cr);
+
+#if PLATFORM(GTK)
+    GdkRegion* reg = gdk_region_new();
     for (unsigned i = 0; i < rectCount; i++) {
-        IntRect focusRect = rects[i];
-        focusRect.inflate(offset);
-        finalFocusRect.unite(focusRect);
-    }
-
-    cairo_t* cr = m_data->cr;
-    cairo_save(cr);
-    // FIXME: These rects should be rounded
-    cairo_rectangle(cr, finalFocusRect.x(), finalFocusRect.y(), finalFocusRect.width(), finalFocusRect.height());
+        GdkRectangle rect = rects[i];
+        gdk_region_union_with_rect(reg, &rect);
+    }
+    gdk_cairo_region(cr, reg);
+    gdk_region_destroy(reg);
+
+    setColor(cr, color);
+    cairo_set_line_width(cr, 2.0f);
+    setPlatformStrokeStyle(DottedStroke);
+#else
+    int radius = (focusRingWidth() - 1) / 2;
+    for (unsigned i = 0; i < rectCount; i++)
+        addPath(Path::createRoundedRectangle(rects[i], FloatSize(radius, radius)));
 
     // Force the alpha to 50%.  This matches what the Mac does with outline rings.
     Color ringColor(color.red(), color.green(), color.blue(), 127);
     setColor(cr, ringColor);
-    cairo_stroke(cr);
+    cairo_set_line_width(cr, focusRingWidth());
+    setPlatformStrokeStyle(SolidStroke);
+#endif
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_stroke_preserve(cr);
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+    cairo_set_fill_rule(cr, CAIRO_FILL_RULE_WINDING);
+    cairo_fill(cr);
+
+    cairo_pop_group_to_source(cr);
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_paint(cr);
     cairo_restore(cr);
 }

trunk/WebCore/platform/gtk/TemporaryLinkStubs.cpp

@@ -59 +59 @@
 void PluginView::invalidateRegion(NPRegion) { notImplemented(); }
 
-Color WebCore::focusRingColor() { return 0xFF0000FF; }
+Color WebCore::focusRingColor() { return Color(); }
 void WebCore::setFocusRingColorChangeFunction(void (*)()) { }