Changeset 54494

Timestamp:

02/08/10 10:20:57 (6 weeks ago)

Author:

bfulgham@webkit.org

Message:

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.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebFrame.cpp (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKit/win/WebFrame.cpp

@@ -2085 +2085 @@
     // 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;