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

Side by Side Diff: Source/core/layout/LayoutView.cpp

Issue 1194473003: Make updateLayoutAndStyleForPainting() O(N) in terms of frame number in LayoutView::hitTest() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebasae layout test result because the order of the when the tracing runs changed Created 5 years, 6 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 | « Source/core/layout/LayoutView.h ('k') | no next file » | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 setPositionState(AbsolutePosition); // to 0,0 :) 77 setPositionState(AbsolutePosition); // to 0,0 :)
78 } 78 }
79 79
80 LayoutView::~LayoutView() 80 LayoutView::~LayoutView()
81 { 81 {
82 } 82 }
83 83
84 bool LayoutView::hitTest(HitTestResult& result) 84 bool LayoutView::hitTest(HitTestResult& result)
85 { 85 {
86 // We have to recursively update layout/style here because otherwise, when t he hit test recurses
87 // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer
88 // that are higher up in the call stack, leading to crashes.
89 // Note that Document::updateLayout calls its parent's updateLayout.
90 frameView()->updateLayoutAndStyleForPainting();
91 return hitTestNoLayoutAndStyleUpdate(result);
92 }
93
94 bool LayoutView::hitTestNoLayoutAndStyleUpdate(HitTestResult& result)
95 {
86 TRACE_EVENT_BEGIN0("blink,devtools.timeline", "HitTest"); 96 TRACE_EVENT_BEGIN0("blink,devtools.timeline", "HitTest");
87 m_hitTestCount++; 97 m_hitTestCount++;
88 98
89 ASSERT(!result.hitTestLocation().isRectBasedTest() || result.hitTestRequest( ).listBased()); 99 ASSERT(!result.hitTestLocation().isRectBasedTest() || result.hitTestRequest( ).listBased());
90 100
91 // We have to recursively update layout/style here because otherwise, when t he hit test recurses
92 // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer
93 // that are higher up in the call stack, leading to crashes.
94 // Note that Document::updateLayout calls its parent's updateLayout.
95 // FIXME: It should be the caller's responsibility to ensure an up-to-date l ayout.
96 frameView()->updateLayoutAndStyleForPainting();
97 commitPendingSelection(); 101 commitPendingSelection();
98 102
99 uint64_t domTreeVersion = document().domTreeVersion(); 103 uint64_t domTreeVersion = document().domTreeVersion();
100 HitTestResult cacheResult = result; 104 HitTestResult cacheResult = result;
101 bool cacheHit = m_hitTestCache->lookupCachedResult(cacheResult, domTreeVersi on); 105 bool cacheHit = m_hitTestCache->lookupCachedResult(cacheResult, domTreeVersi on);
102 bool hitLayer = layer()->hitTest(result); 106 bool hitLayer = layer()->hitTest(result);
103 107
104 // FrameView scrollbars are not the same as Layer scrollbars tested by Layer ::hitTestOverflowControls, 108 // FrameView scrollbars are not the same as Layer scrollbars tested by Layer ::hitTestOverflowControls,
105 // so we need to test FrameView scrollbars separately here. Note that it's i mportant we do this after 109 // so we need to test FrameView scrollbars separately here. Note that it's i mportant we do this after
106 // the hit test above, because that may overwrite the entire HitTestResult w hen it finds a hit. 110 // the hit test above, because that may overwrite the entire HitTestResult w hen it finds a hit.
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 return viewHeight(IncludeScrollbars) / scale; 962 return viewHeight(IncludeScrollbars) / scale;
959 } 963 }
960 964
961 void LayoutView::willBeDestroyed() 965 void LayoutView::willBeDestroyed()
962 { 966 {
963 LayoutBlockFlow::willBeDestroyed(); 967 LayoutBlockFlow::willBeDestroyed();
964 m_compositor.clear(); 968 m_compositor.clear();
965 } 969 }
966 970
967 } // namespace blink 971 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutView.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698