[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 2afb2afa80510891e0f4684cfcd1a6c181b9588a
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 6 19:59:40 2010 +0000

    REGERSSION (r73310?): Contents of <select> popup menus are upside-down on Windows
    https://bugs.webkit.org/show_bug.cgi?id=50544
    <rdar://problem/8732336>
    
    Reviewed by Dan Bernstein.
    
    * Shared/BackingStore.cpp:
    * Shared/BackingStore.h:
    * Shared/cairo/BackingStoreCairo.cpp:
    Remove BackingStore::createFlippedGraphicsContext.
    
    * WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp:
    (WebKit::WebPopupMenu::setUpPlatformData):
    Don't create a flipped graphics context.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e5554f3..06898d6 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Dan Bernstein.
 
+        REGERSSION (r73310?): Contents of <select> popup menus are upside-down on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=50544
+        <rdar://problem/8732336>
+
+        * Shared/BackingStore.cpp:
+        * Shared/BackingStore.h:
+        * Shared/cairo/BackingStoreCairo.cpp:
+        Remove BackingStore::createFlippedGraphicsContext.
+
+        * WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp:
+        (WebKit::WebPopupMenu::setUpPlatformData):
+        Don't create a flipped graphics context.
+
+2010-12-06  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Dan Bernstein.
+
         REGRESSION: Text in Find indicator is vertically flipped
         https://bugs.webkit.org/show_bug.cgi?id=50524
         <rdar://problem/8732978>
diff --git a/WebKit2/Shared/BackingStore.cpp b/WebKit2/Shared/BackingStore.cpp
index f64c0a7..4244eaa 100644
--- a/WebKit2/Shared/BackingStore.cpp
+++ b/WebKit2/Shared/BackingStore.cpp
@@ -125,15 +125,4 @@ void* BackingStore::data() const
     return m_data;
 }
 
-PassOwnPtr<GraphicsContext> BackingStore::createFlippedGraphicsContext()
-{
-    OwnPtr<GraphicsContext> graphicsContext = createGraphicsContext();
-
-    // Flip the coordinate system.
-    graphicsContext->translate(0, m_size.height());
-    graphicsContext->scale(FloatSize(1, -1));
-
-    return graphicsContext.release();
-}
-    
 } // namespace WebKit
diff --git a/WebKit2/Shared/BackingStore.h b/WebKit2/Shared/BackingStore.h
index ee90d3a..7b3c905 100644
--- a/WebKit2/Shared/BackingStore.h
+++ b/WebKit2/Shared/BackingStore.h
@@ -62,7 +62,6 @@ public:
 
     // Create a graphics context that can be used to paint into the backing store.
     PassOwnPtr<WebCore::GraphicsContext> createGraphicsContext();
-    PassOwnPtr<WebCore::GraphicsContext> createFlippedGraphicsContext();
 
     // Paint the backing store into the given context.
     void paint(WebCore::GraphicsContext&, const WebCore::IntPoint& dstPoint, const WebCore::IntRect& srcRect);
diff --git a/WebKit2/Shared/cairo/BackingStoreCairo.cpp b/WebKit2/Shared/cairo/BackingStoreCairo.cpp
index 105c5e5..ac18dfb 100644
--- a/WebKit2/Shared/cairo/BackingStoreCairo.cpp
+++ b/WebKit2/Shared/cairo/BackingStoreCairo.cpp
@@ -38,12 +38,6 @@ PassOwnPtr<GraphicsContext> BackingStore::createGraphicsContext()
     return 0;
 }
 
-PassOwnPtr<GraphicsContext> BackingStore::createFlippedGraphicsContext()
-{
-    notImplemented();
-    return 0;
-}
-
 void BackingStore::paint(GraphicsContext&, const IntPoint&, const IntRect&)
 {
     notImplemented();
diff --git a/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp b/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
index 96bac62..561141f 100644
--- a/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
@@ -78,8 +78,8 @@ void WebPopupMenu::setUpPlatformData(PlatformPopupMenuData& data)
     data.m_notSelectedBackingStore = BackingStore::createSharable(data.m_backingStoreSize);
     data.m_selectedBackingStore = BackingStore::createSharable(data.m_backingStoreSize);
 
-    OwnPtr<GraphicsContext> notSelectedBackingStoreContext = data.m_notSelectedBackingStore->createFlippedGraphicsContext();
-    OwnPtr<GraphicsContext> selectedBackingStoreContext = data.m_selectedBackingStore->createFlippedGraphicsContext();
+    OwnPtr<GraphicsContext> notSelectedBackingStoreContext = data.m_notSelectedBackingStore->createGraphicsContext();
+    OwnPtr<GraphicsContext> selectedBackingStoreContext = data.m_selectedBackingStore->createGraphicsContext();
 
     Color activeOptionBackgroundColor = RenderTheme::defaultTheme()->activeListBoxSelectionBackgroundColor();
     Color activeOptionTextColor = RenderTheme::defaultTheme()->activeListBoxSelectionForegroundColor();

-- 
WebKit Debian packaging