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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6f7168459d1cb77d2d7768608bf9662420f2d3fb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 25 01:39:18 2010 +0000

    2010-09-24  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Andreas Kling.
    
            [wx] ChromeClientWx::scaleFactor must return 1.0
            https://bugs.webkit.org/show_bug.cgi?id=46542
    
            The default value of ChromeClientWx::scaleFactor must be 1.0.
            Otherwise, canvas element won't be painted.
    
            * WebKitSupport/ChromeClientWx.cpp:
            (WebCore::ChromeClientWx::scaleFactor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68319 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 7aedbac..d66f896 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-24  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Andreas Kling.
+
+        [wx] ChromeClientWx::scaleFactor must return 1.0
+        https://bugs.webkit.org/show_bug.cgi?id=46542
+
+        The default value of ChromeClientWx::scaleFactor must be 1.0.
+        Otherwise, canvas element won't be painted.
+
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::scaleFactor):
+
 2010-09-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
index 9c90596..11c5643 100644
--- a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
@@ -108,7 +108,7 @@ FloatRect ChromeClientWx::pageRect()
 float ChromeClientWx::scaleFactor()
 {
     notImplemented();
-    return 0.0;
+    return 1.0;
 }
 
 void ChromeClientWx::focus()

-- 
WebKit Debian packaging