[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bfulgham at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 836a6b30f4f00e647fe1fc8be7bf3bb8c0844373
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 23:51:49 2010 +0000

    Account for scale and current context position (as well as page
    position) in the device context world transform passed to
    plugins.  This is especially important for print surface DPI.
    http://bugs.webkit.org/show_bug.cgi?id=32909.
    
    Reviewed by Jon Honeycutt.
    
    * plugins/win/PluginViewWin.cpp:
    (WebCore::PluginView::paintWindowedPluginIntoContext): Revise
      world context handling to include scaling and translation
      already set for the CTM.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52955 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd1b480..5a06ca9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-07  Brent Fulgham  <bfulgham at webkit.org>
+
+        Reviewed by Jon Honeycutt.
+
+        Account for scale and current context position (as well as page
+        position) in the device context world transform passed to
+        plugins.  This is especially important for print surface DPI.
+        http://bugs.webkit.org/show_bug.cgi?id=32909.
+
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginView::paintWindowedPluginIntoContext): Revise
+          world context handling to include scaling and translation
+          already set for the CTM.
+
 2010-01-07  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/plugins/win/PluginViewWin.cpp b/WebCore/plugins/win/PluginViewWin.cpp
index 9ab68b5..87360aa 100644
--- a/WebCore/plugins/win/PluginViewWin.cpp
+++ b/WebCore/plugins/win/PluginViewWin.cpp
@@ -571,9 +571,9 @@ void PluginView::paintWindowedPluginIntoContext(GraphicsContext* context, const
 
     // The plugin expects the DC to be in client coordinates, so we translate
     // the DC to make that so.
-    XFORM transform = originalTransform;
-    transform.eDx = locationInWindow.x();
-    transform.eDy = locationInWindow.y();
+    TransformationMatrix ctm = context->getCTM();
+    ctm.translate(locationInWindow.x(), locationInWindow.y());
+    XFORM transform = static_cast<XFORM>(ctm);
 
     SetWorldTransform(hdc, &transform);
 

-- 
WebKit Debian packaging