[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ebfef6633dd95d286bae2f36ee22d5388049a2ff
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 18:18:24 2010 +0000

    Move GraphicsContext setup code to PageOverlay::drawRect
    https://bugs.webkit.org/show_bug.cgi?id=49389
    
    Reviewed by John Sullivan.
    
    * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
    * WebProcess/WebPage/FindController.cpp:
    (WebKit::FindController::drawRect):
    * WebProcess/WebPage/PageOverlay.cpp:
    (WebKit::PageOverlay::drawRect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5bfd517..3c259f0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-11  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by John Sullivan.
+
+        Move GraphicsContext setup code to PageOverlay::drawRect
+        https://bugs.webkit.org/show_bug.cgi?id=49389
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::drawRect):
+        * WebProcess/WebPage/PageOverlay.cpp:
+        (WebKit::PageOverlay::drawRect):
+
 2010-11-11  Adam Roben  <aroben at apple.com>
 
         Build fix after r71816
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
index 194039e..02cadc9 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
@@ -39,7 +39,7 @@
 extern "C" {
 #endif
 
-// Page overload client.
+// Page overlay client.
 typedef void (*WKBundlePageOverlayWillMoveToPageCallback)(WKBundlePageOverlayRef pageOverlay, WKBundlePageRef page, const void *clientInfo);
 typedef void (*WKBundlePageOverlayDidMoveToPageCallback)(WKBundlePageOverlayRef pageOverlay, WKBundlePageRef page, const void *clientInfo);
 typedef void (*WKBundlePageOverlayDrawRectCallback)(WKBundlePageOverlayRef pageOverlay, void* graphicsContext, WKRect dirtyRect, const void *clientInfo);
diff --git a/WebKit2/WebProcess/WebPage/FindController.cpp b/WebKit2/WebProcess/WebPage/FindController.cpp
index e7c6ff4..31cf526 100644
--- a/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -254,9 +254,6 @@ void FindController::drawRect(PageOverlay*, GraphicsContext& graphicsContext, co
     Vector<IntRect> rects = rectsForTextMatches();
     ASSERT(!rects.isEmpty());
 
-    graphicsContext.beginTransparencyLayer(1);
-    graphicsContext.setCompositeOperation(CompositeCopy);
-
     // Draw the background.
     graphicsContext.fillRect(dirtyRect, overlayBackgroundColor(), ColorSpaceSRGB);
 
@@ -275,15 +272,11 @@ void FindController::drawRect(PageOverlay*, GraphicsContext& graphicsContext, co
 
     graphicsContext.restore();
 
-    graphicsContext.save();
     graphicsContext.setFillColor(Color::transparent, ColorSpaceSRGB);
 
     // Clear out the holes.
     for (size_t i = 0; i < rects.size(); ++i)
         graphicsContext.fillRect(rects[i]);
-
-    graphicsContext.restore();
-    graphicsContext.endTransparencyLayer();
 }
 
 bool FindController::mouseEvent(PageOverlay* pageOverlay, const WebMouseEvent& mouseEvent)
diff --git a/WebKit2/WebProcess/WebPage/PageOverlay.cpp b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
index 710314d..18d7203 100644
--- a/WebKit2/WebProcess/WebPage/PageOverlay.cpp
+++ b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
@@ -81,8 +81,15 @@ void PageOverlay::drawRect(GraphicsContext& graphicsContext, const IntRect& dirt
     IntRect paintRect = intersection(dirtyRect, bounds());
     if (paintRect.isEmpty())
         return;
-    
+
+    graphicsContext.save();
+    graphicsContext.beginTransparencyLayer(1);
+    graphicsContext.setCompositeOperation(CompositeCopy);
+
     m_client->drawRect(this, graphicsContext, paintRect);
+
+    graphicsContext.endTransparencyLayer();
+    graphicsContext.restore();
 }
     
 bool PageOverlay::mouseEvent(const WebMouseEvent& mouseEvent)

-- 
WebKit Debian packaging