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

rniwa at webkit.org rniwa at webkit.org
Wed Dec 22 13:19:44 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ed612a9c5861e44ef6add07d4ba3d5c85904ce94
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 05:50:54 2010 +0000

    2010-09-10  Ryosuke Niwa  <rniwa at webkit.org>
    
            Unreviewed, speculative chromium build fix.
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::setZoomLevel):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 19a111a..6b782fc 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-10  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Unreviewed, speculative chromium build fix.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setZoomLevel):
+
 2010-09-10  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index bee8f9c..bdb4c35 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -1495,7 +1495,7 @@ int WebViewImpl::setZoomLevel(bool textOnly, int zoomLevel)
     if (!view)
         return m_zoomLevel;
 
-    float oldZoomFactor = m_zoomTextOnly ? view->textZoomFactor() : page->textZoomFactor();
+    float oldZoomFactor = m_zoomTextOnly ? view->textZoomFactor() : m_page->textZoomFactor();
 
     if (textOnly)
         view->setPageAndTextZoomFactors(1, zoomFactor);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list