[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[bfulgham at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 4d260f2a4d6e511a5a597c5305351b05ceda2cec
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 18:55:07 2010 +0000

    Unreviewed correction.
    
    Accidentally left unnecessary modification to hdcFromContext
    in when landing r52995.
    
    * WebFrame.cpp:
    (hdcFromContext): Back out unneeded modification.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index d0ada00..283a8a0 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,15 @@
 2010-01-08  Brent Fulgham  <bfulgham at webkit.org>
 
+        Unreviewed correction. 
+
+        Accidentally left unnecessary modification to hdcFromContext
+        in when landing r52995.
+
+        * WebFrame.cpp:
+        (hdcFromContext): Back out unneeded modification.
+
+2010-01-08  Brent Fulgham  <bfulgham at webkit.org>
+
         Reviewed by Adam Roben.
 
         Use correct cairo surface data type for handling print operations.
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 2c8aa03..86041cc 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -2021,11 +2021,7 @@ static float scaleFactor(HDC printDC, const IntRect& pageRect)
 static HDC hdcFromContext(PlatformGraphicsContext* pctx)
 {
     cairo_surface_t* surface = cairo_get_target(pctx);
-    HDC hdc = cairo_win32_surface_get_dc(surface);
-
-    SetGraphicsMode(hdc, GM_ADVANCED);
-
-    return hdc;
+    return cairo_win32_surface_get_dc(surface);
 }
 
 void WebFrame::drawHeader(PlatformGraphicsContext* pctx, IWebUIDelegate* ui, const IntRect& pageRect, float headerHeight)

-- 
WebKit Debian packaging