[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 13:19:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4ce803cfaef0dafd5662ff7de5b69fe4a4cc7825
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 11 05:57:02 2010 +0000
Fix chromium build.
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setZoomLevel):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67283 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6b782fc..5c302af 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-10 Sam Weinig <sam at webkit.org>
+
+ Fix chromium build.
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setZoomLevel):
+
2010-09-10 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed, speculative chromium build fix.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index bdb4c35..043e328 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() : m_page->textZoomFactor();
+ float oldZoomFactor = m_zoomTextOnly ? view->textZoomFactor() : view->pageZoomFactor();
if (textOnly)
view->setPageAndTextZoomFactors(1, zoomFactor);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list