[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mjs at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 7038ef52cefe3caa8936789cc1b2a3b7a184edb5
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 18:26:51 2011 +0000

    Change some floating point constants from 1.0 to 1.
    
    Rubber stamped by Dan Bernstein.
    
    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76608 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 86da191..c6cb4b5 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-25  Maciej Stachowiak  <mjs at apple.com>
 
+        Rubber stamped by Dan Bernstein.
+
+        Change some floating point constants from 1.0 to 1.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
+
+2011-01-25  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Anders Carlsson.
 
         Improve scale factor resetting
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index dc59397..49452f9 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -432,8 +432,8 @@ void WebFrameLoaderClient::dispatchDidCommitLoad()
 
     // Only restore the scale factor for standard frame loads (of the main frame).
     if (m_frame->isMainFrame() && m_frame->coreFrame()->loader()->loadType() == FrameLoadTypeStandard) {
-        if (m_frame->coreFrame()->pageScaleFactor() != 1.0)
-            webPage->scaleWebView(1.0, IntPoint());
+        if (m_frame->coreFrame()->pageScaleFactor() != 1)
+            webPage->scaleWebView(1, IntPoint());
     }
 }
 

-- 
WebKit Debian packaging