[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[bfulgham at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f4c6f8a7547a7b25848925b04a5523d9310f31db
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 18:20:57 2010 +0000

    Include header position in World Transform used for plugin positioning.
    https://bugs.webkit.org/show_bug.cgi?id=34709
    
    Reviewed by Adam Roben.
    
    * WebFrame.cpp:
    (WebFrame::spoolPage): Correct WinCairo plugin print positioning to
      account for header size.  Existing code ignored this, causing
      plugins to overlay other elements.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54494 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index da1ab05..09f8d7e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-08  Brent Fulgham  <bfulgham at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Include header position in World Transform used for plugin positioning.
+        https://bugs.webkit.org/show_bug.cgi?id=34709
+
+        * WebFrame.cpp:
+        (WebFrame::spoolPage): Correct WinCairo plugin print positioning to
+          account for header size.  Existing code ignored this, causing
+          plugins to overlay other elements.
+
 2010-02-04  Alice Liu  <alice.liu at apple.com>
 
         Reviewed by Jon Honeycutt.
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index c2c71ee..b7ad014 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -2084,13 +2084,13 @@ void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCt
 
     // Modify Cairo and GDI World Transform to account for margin in the
     // subsequent WebKit-controlled 'paintContents' drawing operations:
-    spoolCtx->translate(cairoMarginRect.x(), cairoMarginRect.y());
+    spoolCtx->translate(cairoMarginRect.x(), cairoMarginRect.y() + headerHeight);
 
     // Modify Cairo (only) to account for page position.
-    cairo_translate(pctx, -pageRect.x(), -pageRect.y() + headerHeight);
+    cairo_translate(pctx, -pageRect.x(), -pageRect.y());
     coreFrame->view()->paintContents(spoolCtx, pageRect);
 
-    cairo_translate(pctx, pageRect.x(), pageRect.y() - headerHeight);
+    cairo_translate(pctx, pageRect.x(), pageRect.y());
 
     XFORM originalWorld;
     ::GetWorldTransform(printDC, &originalWorld);

-- 
WebKit Debian packaging