Commit 0d40f32a authored by Joel Hockey's avatar Joel Hockey Committed by Commit Bot

s/IsFrameView/IsLocalFrameView

I forgot to update this when renaming FrameView to LocalFrameView in
https://chromium-review.googlesource.com/c/516862/

Bug: 637460
Change-Id: I71e6b770746a58cde6e726fe6356c627c5b8d419
Reviewed-on: https://chromium-review.googlesource.com/520825Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476217}
parent 7059102e
...@@ -20,7 +20,7 @@ class CORE_EXPORT FrameOrPlugin : public GarbageCollectedMixin { ...@@ -20,7 +20,7 @@ class CORE_EXPORT FrameOrPlugin : public GarbageCollectedMixin {
public: public:
virtual ~FrameOrPlugin() {} virtual ~FrameOrPlugin() {}
virtual bool IsFrameView() const { return false; } virtual bool IsLocalFrameView() const { return false; }
virtual bool IsPluginView() const { return false; } virtual bool IsPluginView() const { return false; }
virtual void Attach() = 0; virtual void Attach() = 0;
......
...@@ -661,7 +661,7 @@ class CORE_EXPORT LocalFrameView final ...@@ -661,7 +661,7 @@ class CORE_EXPORT LocalFrameView final
const Scrollbar&, const Scrollbar&,
const IntPoint&) const override; const IntPoint&) const override;
bool IsFrameView() const override { return true; } bool IsLocalFrameView() const override { return true; }
DECLARE_VIRTUAL_TRACE(); DECLARE_VIRTUAL_TRACE();
void NotifyPageThatContentAreaWillPaint() const; void NotifyPageThatContentAreaWillPaint() const;
...@@ -1259,18 +1259,18 @@ inline void LocalFrameView::IncrementVisuallyNonEmptyPixelCount( ...@@ -1259,18 +1259,18 @@ inline void LocalFrameView::IncrementVisuallyNonEmptyPixelCount(
DEFINE_TYPE_CASTS(LocalFrameView, DEFINE_TYPE_CASTS(LocalFrameView,
PlatformFrameView, PlatformFrameView,
platform_frame_view, platform_frame_view,
platform_frame_view->IsFrameView(), platform_frame_view->IsLocalFrameView(),
platform_frame_view.IsFrameView()); platform_frame_view.IsLocalFrameView());
DEFINE_TYPE_CASTS(LocalFrameView, DEFINE_TYPE_CASTS(LocalFrameView,
FrameOrPlugin, FrameOrPlugin,
frame_or_plugin, frame_or_plugin,
frame_or_plugin->IsFrameView(), frame_or_plugin->IsLocalFrameView(),
frame_or_plugin.IsFrameView()); frame_or_plugin.IsLocalFrameView());
DEFINE_TYPE_CASTS(LocalFrameView, DEFINE_TYPE_CASTS(LocalFrameView,
ScrollableArea, ScrollableArea,
scrollableArea, scrollableArea,
scrollableArea->IsFrameView(), scrollableArea->IsLocalFrameView(),
scrollableArea.IsFrameView()); scrollableArea.IsLocalFrameView());
} // namespace blink } // namespace blink
......
...@@ -95,7 +95,7 @@ LayoutPart::~LayoutPart() { ...@@ -95,7 +95,7 @@ LayoutPart::~LayoutPart() {
LocalFrameView* LayoutPart::ChildFrameView() const { LocalFrameView* LayoutPart::ChildFrameView() const {
FrameOrPlugin* frame_or_plugin = GetFrameOrPlugin(); FrameOrPlugin* frame_or_plugin = GetFrameOrPlugin();
if (frame_or_plugin && frame_or_plugin->IsFrameView()) if (frame_or_plugin && frame_or_plugin->IsLocalFrameView())
return ToLocalFrameView(frame_or_plugin); return ToLocalFrameView(frame_or_plugin);
return nullptr; return nullptr;
} }
......
...@@ -32,7 +32,7 @@ ScrollAnchor::~ScrollAnchor() {} ...@@ -32,7 +32,7 @@ ScrollAnchor::~ScrollAnchor() {}
void ScrollAnchor::SetScroller(ScrollableArea* scroller) { void ScrollAnchor::SetScroller(ScrollableArea* scroller) {
DCHECK_NE(scroller_, scroller); DCHECK_NE(scroller_, scroller);
DCHECK(scroller); DCHECK(scroller);
DCHECK(scroller->IsRootFrameViewport() || scroller->IsFrameView() || DCHECK(scroller->IsRootFrameViewport() || scroller->IsLocalFrameView() ||
scroller->IsPaintLayerScrollableArea()); scroller->IsPaintLayerScrollableArea());
scroller_ = scroller; scroller_ = scroller;
ClearSelf(); ClearSelf();
......
...@@ -50,7 +50,8 @@ class ScrollAnchorTest ...@@ -50,7 +50,8 @@ class ScrollAnchorTest
} }
ScrollAnchor& GetScrollAnchor(ScrollableArea* scroller) { ScrollAnchor& GetScrollAnchor(ScrollableArea* scroller) {
DCHECK(scroller->IsFrameView() || scroller->IsPaintLayerScrollableArea()); DCHECK(scroller->IsLocalFrameView() ||
scroller->IsPaintLayerScrollableArea());
return *(scroller->GetScrollAnchor()); return *(scroller->GetScrollAnchor());
} }
......
...@@ -547,7 +547,7 @@ bool ScrollingCoordinator::ScrollableAreaScrollLayerDidChange( ...@@ -547,7 +547,7 @@ bool ScrollingCoordinator::ScrollableAreaScrollLayerDidChange(
// LocalFrameView::CompositorAnimationTimeline() can indirectly return // LocalFrameView::CompositorAnimationTimeline() can indirectly return
// m_programmaticScrollAnimatorTimeline if it does not have its own // m_programmaticScrollAnimatorTimeline if it does not have its own
// timeline. // timeline.
if (scrollable_area->IsFrameView()) { if (scrollable_area->IsLocalFrameView()) {
timeline = timeline =
ToLocalFrameView(scrollable_area)->GetCompositorAnimationTimeline(); ToLocalFrameView(scrollable_area)->GetCompositorAnimationTimeline();
} else if (scrollable_area->IsPaintLayerScrollableArea()) { } else if (scrollable_area->IsPaintLayerScrollableArea()) {
...@@ -988,7 +988,7 @@ Region ScrollingCoordinator::ComputeShouldHandleScrollGestureOnMainThreadRegion( ...@@ -988,7 +988,7 @@ Region ScrollingCoordinator::ComputeShouldHandleScrollGestureOnMainThreadRegion(
if (const LocalFrameView::ScrollableAreaSet* scrollable_areas = if (const LocalFrameView::ScrollableAreaSet* scrollable_areas =
frame_view->ScrollableAreas()) { frame_view->ScrollableAreas()) {
for (const ScrollableArea* scrollable_area : *scrollable_areas) { for (const ScrollableArea* scrollable_area : *scrollable_areas) {
if (scrollable_area->IsFrameView() && if (scrollable_area->IsLocalFrameView() &&
ToLocalFrameView(scrollable_area)->ShouldThrottleRendering()) ToLocalFrameView(scrollable_area)->ShouldThrottleRendering())
continue; continue;
// Composited scrollable areas can be scrolled off the main thread. // Composited scrollable areas can be scrolled off the main thread.
......
...@@ -17,7 +17,7 @@ class PLATFORM_EXPORT PlatformFrameView { ...@@ -17,7 +17,7 @@ class PLATFORM_EXPORT PlatformFrameView {
PlatformFrameView() {} PlatformFrameView() {}
virtual ~PlatformFrameView() {} virtual ~PlatformFrameView() {}
virtual bool IsFrameView() const { return false; } virtual bool IsLocalFrameView() const { return false; }
}; };
} // namespace blink } // namespace blink
......
...@@ -348,7 +348,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin, ...@@ -348,7 +348,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin,
const LayoutObject*, const LayoutObject*,
unsigned = 0) const; unsigned = 0) const;
virtual bool IsFrameView() const { return false; } virtual bool IsLocalFrameView() const { return false; }
virtual bool IsPaintLayerScrollableArea() const { return false; } virtual bool IsPaintLayerScrollableArea() const { return false; }
virtual bool IsRootFrameViewport() const { return false; } virtual bool IsRootFrameViewport() const { return false; }
......
...@@ -557,7 +557,7 @@ void ChromeClientImpl::InvalidateRect(const IntRect& update_rect) { ...@@ -557,7 +557,7 @@ void ChromeClientImpl::InvalidateRect(const IntRect& update_rect) {
void ChromeClientImpl::ScheduleAnimation( void ChromeClientImpl::ScheduleAnimation(
const PlatformFrameView* platform_frame_view) { const PlatformFrameView* platform_frame_view) {
DCHECK(platform_frame_view->IsFrameView()); DCHECK(platform_frame_view->IsLocalFrameView());
LocalFrame& frame = LocalFrame& frame =
ToLocalFrameView(platform_frame_view)->GetFrame().LocalFrameRoot(); ToLocalFrameView(platform_frame_view)->GetFrame().LocalFrameRoot();
// If the frame is still being created, it might not yet have a WebWidget. // If the frame is still being created, it might not yet have a WebWidget.
...@@ -574,7 +574,7 @@ IntRect ChromeClientImpl::ViewportToScreen( ...@@ -574,7 +574,7 @@ IntRect ChromeClientImpl::ViewportToScreen(
const PlatformFrameView* platform_frame_view) const { const PlatformFrameView* platform_frame_view) const {
WebRect screen_rect(rect_in_viewport); WebRect screen_rect(rect_in_viewport);
DCHECK(platform_frame_view->IsFrameView()); DCHECK(platform_frame_view->IsLocalFrameView());
const LocalFrameView* view = ToLocalFrameView(platform_frame_view); const LocalFrameView* view = ToLocalFrameView(platform_frame_view);
LocalFrame& frame = view->GetFrame().LocalFrameRoot(); LocalFrame& frame = view->GetFrame().LocalFrameRoot();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment