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

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

Issue 1158673008: Moving HitTest function to DeprecatedPaintLayerStackingNode. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed TODO 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 | « no previous file | Source/core/paint/DeprecatedPaintLayer.h » ('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) 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 ASSERT(!location.isRectBasedTest() || request.listBased()); 121 ASSERT(!location.isRectBasedTest() || request.listBased());
122 122
123 // We have to recursively update layout/style here because otherwise, when t he hit test recurses 123 // We have to recursively update layout/style here because otherwise, when t he hit test recurses
124 // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer 124 // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer
125 // that are higher up in the call stack, leading to crashes. 125 // that are higher up in the call stack, leading to crashes.
126 // Note that Document::updateLayout calls its parent's updateLayout. 126 // Note that Document::updateLayout calls its parent's updateLayout.
127 // FIXME: It should be the caller's responsibility to ensure an up-to-date l ayout. 127 // FIXME: It should be the caller's responsibility to ensure an up-to-date l ayout.
128 frameView()->updateLayoutAndStyleForPainting(); 128 frameView()->updateLayoutAndStyleForPainting();
129 commitPendingSelection(); 129 commitPendingSelection();
130 130
131 bool hitLayer = layer()->hitTest(request, location, result); 131 bool hitLayer = layer()->stackingNode()->hitTest(request, location, result);
132 132
133 // FrameView scrollbars are not the same as Layer scrollbars tested by Layer ::hitTestOverflowControls, 133 // FrameView scrollbars are not the same as Layer scrollbars tested by Layer ::hitTestOverflowControls,
134 // so we need to test FrameView scrollbars separately here. Note that it's i mportant we do this after 134 // so we need to test FrameView scrollbars separately here. Note that it's i mportant we do this after
135 // the hit test above, because that may overwrite the entire HitTestResult w hen it finds a hit. 135 // the hit test above, because that may overwrite the entire HitTestResult w hen it finds a hit.
136 IntPoint framePoint = frameView()->contentsToFrame(location.roundedPoint()); 136 IntPoint framePoint = frameView()->contentsToFrame(location.roundedPoint());
137 if (Scrollbar* frameScrollbar = frameView()->scrollbarAtFramePoint(framePoin t)) 137 if (Scrollbar* frameScrollbar = frameView()->scrollbarAtFramePoint(framePoin t))
138 result.setScrollbar(frameScrollbar); 138 result.setScrollbar(frameScrollbar);
139 139
140 TRACE_EVENT_END1("blink", "LayoutView::hitTest", "info", hitTestInfo(request , location, result)); 140 TRACE_EVENT_END1("blink", "LayoutView::hitTest", "info", hitTestInfo(request , location, result));
141 return hitLayer; 141 return hitLayer;
(...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 return viewHeight(IncludeScrollbars) / scale; 992 return viewHeight(IncludeScrollbars) / scale;
993 } 993 }
994 994
995 void LayoutView::willBeDestroyed() 995 void LayoutView::willBeDestroyed()
996 { 996 {
997 LayoutBlockFlow::willBeDestroyed(); 997 LayoutBlockFlow::willBeDestroyed();
998 m_compositor.clear(); 998 m_compositor.clear();
999 } 999 }
1000 1000
1001 } // namespace blink 1001 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/paint/DeprecatedPaintLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698