Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1021)

Unified Diff: Source/web/WebViewImpl.cpp

Issue 22419002: Set up clip and scroll parents on the blink side. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 0fc79df8a17a0925508dfff0ed5945cd5d88150c..68536e61e53a3bab483683e99b320fb499c712d4 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -3970,6 +3970,10 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
void WebViewImpl::updateMainFrameScrollPosition(const IntPoint& scrollPosition, bool programmaticScroll)
{
+ TRACE_EVENT1("impl-scroll",
enne (OOO) 2013/08/22 20:54:30 Should this go after the early outs?
+ "WebViewImpl::updateMainFrameScrollPosition",
+ "programmatic", programmaticScroll);
+
FrameView* frameView = page()->mainFrame()->view();
if (!frameView)
return;
@@ -3989,7 +3993,7 @@ void WebViewImpl::applyScrollAndScale(const WebSize& scrollDelta, float pageScal
return;
if (pageScaleDelta == 1) {
- TRACE_EVENT_INSTANT2("webkit", "WebViewImpl::applyScrollAndScale::scrollBy", "x", scrollDelta.width, "y", scrollDelta.height);
+ TRACE_EVENT_INSTANT2("webkit,impl-scroll", "WebViewImpl::applyScrollAndScale::scrollBy", "x", scrollDelta.width, "y", scrollDelta.height);
enne (OOO) 2013/08/22 20:54:30 Aren't you tracing updateMainFrameScrollPosition t
WebSize webScrollOffset = mainFrame()->scrollOffset();
IntPoint scrollOffset(webScrollOffset.width + scrollDelta.width, webScrollOffset.height + scrollDelta.height);
updateMainFrameScrollPosition(scrollOffset, false);

Powered by Google App Engine
This is Rietveld 408576698