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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2620453003: Update comments about not setting kHandlingScrollFromMainThread on subframes (Closed)
Patch Set: Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 4780 matching lines...) Expand 10 before | Expand all | Expand 10 after
4791 if (WebLayer* scrollLayer = 4791 if (WebLayer* scrollLayer =
4792 toLocalFrame(frame).view()->layerForScrolling()->platformLayer()) { 4792 toLocalFrame(frame).view()->layerForScrolling()->platformLayer()) {
4793 if (reasons) { 4793 if (reasons) {
4794 scrollLayer->addMainThreadScrollingReasons(reasons); 4794 scrollLayer->addMainThreadScrollingReasons(reasons);
4795 } else { 4795 } else {
4796 // Clear all main thread scrolling reasons except the one that's set 4796 // Clear all main thread scrolling reasons except the one that's set
4797 // if there is a running scroll animation. 4797 // if there is a running scroll animation.
4798 scrollLayer->clearMainThreadScrollingReasons( 4798 scrollLayer->clearMainThreadScrollingReasons(
4799 ~MainThreadScrollingReason::kHandlingScrollFromMainThread); 4799 ~MainThreadScrollingReason::kHandlingScrollFromMainThread);
4800 } 4800 }
4801 reasons |= scrollLayer->mainThreadScrollingReasons();
pdr. 2017/01/06 20:41:29 Will updateSubFrameScrollOnMainReason always get c
yigu 2017/01/11 22:44:45 As discussed, we will not update this reason on su
4801 } 4802 }
4802 4803
4803 Frame* child = frame.tree().firstChild(); 4804 Frame* child = frame.tree().firstChild();
4804 while (child) { 4805 while (child) {
4805 updateSubFrameScrollOnMainReason(*child, reasons); 4806 updateSubFrameScrollOnMainReason(*child, reasons);
4806 child = child->tree().nextSibling(); 4807 child = child->tree().nextSibling();
4807 } 4808 }
4808 4809
4809 if (frame.isMainFrame()) 4810 if (frame.isMainFrame())
4810 m_mainThreadScrollingReasons = reasons; 4811 m_mainThreadScrollingReasons = reasons;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
4904 reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount; 4905 reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount;
4905 ++reason) { 4906 ++reason) {
4906 if (m_mainThreadScrollingReasonsCounter[reason] > 0) { 4907 if (m_mainThreadScrollingReasonsCounter[reason] > 0) {
4907 reasons |= 1 << (reason - 1); 4908 reasons |= 1 << (reason - 1);
4908 } 4909 }
4909 } 4910 }
4910 return reasons; 4911 return reasons;
4911 } 4912 }
4912 4913
4913 } // namespace blink 4914 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698