[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 15:58:29 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 828abebe652e982d7bbebe870f1c72e25862146a
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 17 12:37:49 2010 +0000
2010-11-17 Andreas Kling <kling at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
Don't prohibit scrolling in tiled backing store mode.
We delegate scrolling instead.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72193 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index cf56e64..56f874d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-17 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Don't prohibit scrolling in tiled backing store mode.
+
+ We delegate scrolling instead.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+
2010-11-17 Simon Hausmann <simon.hausmann at nokia.com>
Reviewed by Kenneth Christiansen.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 158bada..7414f1f 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -955,9 +955,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage()
bool isMainFrame = webPage->mainFrame() == m_frame;
m_frame->coreFrame()->createView(m_frame->page()->size(), Color::white, false, webPage->resizesToContentsLayoutSize(), isMainFrame && webPage->resizesToContentsEnabled());
-
- if (isMainFrame && webPage->resizesToContentsEnabled())
- m_frame->coreFrame()->view()->setProhibitsScrolling(true);
#else
m_frame->coreFrame()->createView(m_frame->page()->size(), Color::white, false, IntSize(), false);
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list