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

Side by Side Diff: Source/core/rendering/RenderView.cpp

Issue 919423002: Audited and renamed uses of methods and variables named RootView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix Created 5 years, 10 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
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Note that Document::updateLayout calls its parent's updateLayout. 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. 95 // FIXME: It should be the caller's responsibility to ensure an up-to-date l ayout.
96 frameView()->updateLayoutAndStyleIfNeededRecursive(); 96 frameView()->updateLayoutAndStyleIfNeededRecursive();
97 commitPendingSelection(); 97 commitPendingSelection();
98 98
99 bool hitLayer = layer()->hitTest(request, location, result); 99 bool hitLayer = layer()->hitTest(request, location, result);
100 100
101 // FrameView scrollbars are not the same as Layer scrollbars tested by Layer ::hitTestOverflowControls, 101 // FrameView scrollbars are not the same as Layer scrollbars tested by Layer ::hitTestOverflowControls,
102 // so we need to test FrameView scrollbars separately here. Note that it's i mportant we do this after 102 // so we need to test FrameView scrollbars separately here. Note that it's i mportant we do this after
103 // the hit test above, because that may overwrite the entire HitTestResult w hen it finds a hit. 103 // the hit test above, because that may overwrite the entire HitTestResult w hen it finds a hit.
104 IntPoint viewPoint = location.roundedPoint() - frameView()->scrollOffset(); 104 IntPoint framePoint = frameView()->contentsToFrame(location.roundedPoint());
105 if (Scrollbar* frameScrollbar = frameView()->scrollbarAtViewPoint(viewPoint) ) 105 if (Scrollbar* frameScrollbar = frameView()->scrollbarAtFramePoint(framePoin t))
106 result.setScrollbar(frameScrollbar); 106 result.setScrollbar(frameScrollbar);
107 107
108 return hitLayer; 108 return hitLayer;
109 } 109 }
110 110
111 void RenderView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit, Logi calExtentComputedValues& computedValues) const 111 void RenderView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit, Logi calExtentComputedValues& computedValues) const
112 { 112 {
113 computedValues.m_extent = (!shouldUsePrintingLayout() && m_frameView) ? Layo utUnit(viewLogicalHeight()) : logicalHeight; 113 computedValues.m_extent = (!shouldUsePrintingLayout() && m_frameView) ? Layo utUnit(viewLogicalHeight()) : logicalHeight;
114 } 114 }
115 115
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 } 981 }
982 982
983 void RenderView::invalidateDisplayItemClients(DisplayItemList* displayItemList) const 983 void RenderView::invalidateDisplayItemClients(DisplayItemList* displayItemList) const
984 { 984 {
985 RenderBlockFlow::invalidateDisplayItemClients(displayItemList); 985 RenderBlockFlow::invalidateDisplayItemClients(displayItemList);
986 if (m_frameView) 986 if (m_frameView)
987 displayItemList->invalidate(m_frameView->displayItemClient()); 987 displayItemList->invalidate(m_frameView->displayItemClient());
988 } 988 }
989 989
990 } // namespace blink 990 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698