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: svn://svn.chromium.org/blink/trunk@54494 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit/win/ChangeLog

+2010-02-08  Brent Fulgham  <bfulgham@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@apple.com>
 
         Reviewed by Jon Honeycutt.

third_party/WebKit/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);