Changeset 69452 in webkit

Timestamp:

Oct 9, 2010 11:36:15 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-09 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Implement subregion rendering in WebView when using gtk3
​https://bugs.webkit.org/show_bug.cgi?id=47411

• GNUmakefile.am:
• platform/graphics/FloatRect.h:
• platform/graphics/cairo/FloatRectCairo.cpp: Added. (WebCore::FloatRect::FloatRect): (WebCore::FloatRect::operator cairo_rectangle_t):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/platform/graphics/FloatRect.h (modified) (2 diffs)
• WebCore/platform/graphics/cairo/FloatRectCairo.cpp (added)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Implement subregion rendering in WebView when using gtk3
+        https://bugs.webkit.org/show_bug.cgi?id=47411
+
+        * GNUmakefile.am:
+        * platform/graphics/FloatRect.h:
+        * platform/graphics/cairo/FloatRectCairo.cpp: Added.
+        (WebCore::FloatRect::FloatRect):
+        (WebCore::FloatRect::operator cairo_rectangle_t):
+
+2010-10-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Implement subregion rendering in WebView when using gtk3
+        https://bugs.webkit.org/show_bug.cgi?id=47411
+
+        * GNUmakefile.am:
+        * platform/graphics/FloatRect.h:
+        * platform/graphics/cairo/FloatRectCairo.cpp: Added.
+        (WebCore::FloatRect::FloatRect):
+        (WebCore::FloatRect::operator cairo_rectangle_t):
+
 2010-10-09  Kwang Yul Seo  <skyul@company100.net>
 

trunk/WebCore/GNUmakefile.am

@@ -3456 +3456 @@
         WebCore/platform/graphics/cairo/CairoUtilities.h \
         WebCore/platform/graphics/cairo/ContextShadowCairo.cpp \
+        WebCore/platform/graphics/cairo/FloatRectCairo.cpp \
         WebCore/platform/graphics/cairo/FontCairo.cpp \
         WebCore/platform/graphics/cairo/FontCustomPlatformData.h \

trunk/WebCore/platform/graphics/FloatRect.h

@@ -60 +60 @@
 #endif
 
+#if PLATFORM(CAIRO)
+typedef struct _cairo_rectangle cairo_rectangle_t;
+#endif
+
 namespace WebCore {
 
@@ -173 +177 @@
 #endif
 
+#if PLATFORM(CAIRO)
+    FloatRect(const cairo_rectangle_t&);
+    operator cairo_rectangle_t() const;
+#endif
+
 private:
     FloatPoint m_location;

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -484 +484 @@
 }
 
+static bool shouldCoalesce(const IntRect& rect, const Vector<IntRect>& rects)
+{
+    const unsigned int cRectThreshold = 10;
+    const float cWastedSpaceThreshold = 0.75f;
+    bool useUnionedRect = (rects.size() <= 1) || (rects.size() > cRectThreshold);
+    if (useUnionedRect)
+        return true;
+    // Attempt to guess whether or not we should use the unioned rect or the individual rects.
+    // We do this by computing the percentage of "wasted space" in the union.  If that wasted space
+    // is too large, then we will do individual rect painting instead.
+    float unionPixels = (rect.width() * rect.height());
+    float singlePixels = 0;
+    for (size_t i = 0; i < rects.size(); ++i)
+        singlePixels += rects[i].width() * rects[i].height();
+    float wastedSpace = 1 - (singlePixels / unionPixels);
+    if (wastedSpace <= cWastedSpaceThreshold)
+        useUnionedRect = true;
+    return useUnionedRect;
+}
+
+static void paintWebView(Frame* frame, gboolean transparent, GraphicsContext& context, const IntRect& clipRect, const Vector<IntRect>& rects)
+{
+    bool coalesce = true;
+
+    if (rects.size() > 0)
+        coalesce = shouldCoalesce(clipRect, rects);
+
+    if (coalesce) {
+        context.clip(clipRect);
+        if (transparent)
+            context.clearRect(clipRect);
+        frame->view()->paint(&context, clipRect);
+    } else {
+        for (size_t i = 0; i < rects.size(); i++) {
+            IntRect rect = rects[i];
+            context.save();
+            context.clip(rect);
+            if (transparent)
+                context.clearRect(rect);
+            frame->view()->paint(&context, rect);
+            context.restore();
+        }
+    }
+
+    context.save();
+    context.clip(clipRect);
+    frame->page()->inspectorController()->drawNodeHighlight(context);
+    context.restore();
+}
 #ifdef GTK_API_VERSION_2
-static bool shouldCoalesce(GdkRectangle rect, GdkRectangle* rects, int count)
-{
-    const int cRectThreshold = 10;
-    const float cWastedSpaceThreshold = 0.75f;
-    bool useUnionedRect = (count <= 1) || (count > cRectThreshold);
-    if (!useUnionedRect) {
-        // Attempt to guess whether or not we should use the unioned rect or the individual rects.
-        // We do this by computing the percentage of "wasted space" in the union.  If that wasted space
-        // is too large, then we will do individual rect painting instead.
-        float unionPixels = (rect.width * rect.height);
-        float singlePixels = 0;
-        for (int i = 0; i < count; ++i)
-            singlePixels += rects[i].width * rects[i].height;
-        float wastedSpace = 1 - (singlePixels / unionPixels);
-        if (wastedSpace <= cWastedSpaceThreshold)
-            useUnionedRect = true;
-    }
-    return useUnionedRect;
-}
-
 static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event)
 {
@@ -522 +551 @@
         GOwnPtr<GdkRectangle> rects;
         gdk_region_get_rectangles(event->region, &rects.outPtr(), &rectCount);
-
-        // Avoid recursing into the render tree excessively
-        bool coalesce = shouldCoalesce(event->area, rects.get(), rectCount);
-
-        if (coalesce) {
-            IntRect rect = event->area;
-            ctx.clip(rect);
-            if (priv->transparent)
-                ctx.clearRect(rect);
-            frame->view()->paint(&ctx, rect);
-        } else {
-            for (int i = 0; i < rectCount; i++) {
-                IntRect rect = rects.get()[i];
-                ctx.save();
-                ctx.clip(rect);
-                if (priv->transparent)
-                    ctx.clearRect(rect);
-                frame->view()->paint(&ctx, rect);
-                ctx.restore();
-            }
-        }
-
-        ctx.save();
-        ctx.clip(static_cast<IntRect>(event->area));
-        frame->page()->inspectorController()->drawNodeHighlight(ctx);
-        ctx.restore();
+        Vector<IntRect> paintRects;
+        for (int i = 0; i < rectCount; i++)
+            paintRects.append(IntRect(rects.get()[i]));
+
+        paintWebView(frame, priv->transparent, ctx, static_cast<IntRect>(event->area), paintRects);
     }
 
@@ -566 +574 @@
         GraphicsContext ctx(cr);
         IntRect rect = clipRect;
+        cairo_rectangle_list_t* rectList = cairo_copy_clip_rectangle_list(cr);
 
         frame->view()->updateLayoutAndStyleIfNeededRecursive();
-        if (priv->transparent)
-            ctx.clearRect(rect);
-        frame->view()->paint(&ctx, rect);
-        ctx.save();
-        frame->page()->inspectorController()->drawNodeHighlight(ctx);
-        ctx.restore();
+
+        Vector<IntRect> rects;
+        if (!rectList->status && rectList->num_rectangles > 0) {
+            for (int i = 0; i < rectList->num_rectangles; i++)
+                rects.append(enclosingIntRect(FloatRect(rectList->rectangles[i])));
+        }
+        paintWebView(frame, priv->transparent, ctx, rect, rects);
+
+        cairo_rectangle_list_destroy(rectList);
     }