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

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

Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 adjustOffsetForFixedPosition(rect); 496 adjustOffsetForFixedPosition(rect);
497 497
498 // Apply our transform if we have one (because of full page zooming). 498 // Apply our transform if we have one (because of full page zooming).
499 if (!ancestor && layer() && layer()->transform()) 499 if (!ancestor && layer() && layer()->transform())
500 rect = layer()->transform()->mapRect(rect); 500 rect = layer()->transform()->mapRect(rect);
501 501
502 ASSERT(ancestor); 502 ASSERT(ancestor);
503 if (ancestor == this) 503 if (ancestor == this)
504 return true; 504 return true;
505 505
506 Element* owner = document().ownerElement(); 506 Element* owner = document().localOwnerElement();
507 if (!owner) 507 if (!owner)
508 return true; 508 return true;
509 509
510 if (LayoutBox* obj = owner->layoutBox()) { 510 if (LayoutBox* obj = owner->layoutBox()) {
511 if (!(mode & InputIsInFrameCoordinates)) { 511 if (!(mode & InputIsInFrameCoordinates)) {
512 // Intersect the viewport with the paint invalidation rect. 512 // Intersect the viewport with the paint invalidation rect.
513 LayoutRect viewRectangle = viewRect(); 513 LayoutRect viewRectangle = viewRect();
514 if (visualRectFlags & EdgeInclusive) { 514 if (visualRectFlags & EdgeInclusive) {
515 if (!rect.inclusiveIntersect(viewRectangle)) 515 if (!rect.inclusiveIntersect(viewRectangle))
516 return false; 516 return false;
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 for (auto& media : m_mediaForPositionNotification) { 1014 for (auto& media : m_mediaForPositionNotification) {
1015 media->notifyPositionMayHaveChanged(visibleRect); 1015 media->notifyPositionMayHaveChanged(visibleRect);
1016 } 1016 }
1017 } 1017 }
1018 1018
1019 void LayoutView::updateFromStyle() 1019 void LayoutView::updateFromStyle()
1020 { 1020 {
1021 LayoutBlockFlow::updateFromStyle(); 1021 LayoutBlockFlow::updateFromStyle();
1022 1022
1023 // LayoutView of the main frame is responsible for painting base background. 1023 // LayoutView of the main frame is responsible for painting base background.
1024 if (!document().ownerElement()) 1024 if (!document().localOwnerElement())
1025 setHasBoxDecorationBackground(true); 1025 setHasBoxDecorationBackground(true);
1026 } 1026 }
1027 1027
1028 bool LayoutView::allowsOverflowClip() const 1028 bool LayoutView::allowsOverflowClip() const
1029 { 1029 {
1030 return document().settings() && document().settings()->rootLayerScrolls(); 1030 return document().settings() && document().settings()->rootLayerScrolls();
1031 } 1031 }
1032 1032
1033 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize& delta) 1033 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize& delta)
1034 { 1034 {
1035 // TODO(bokan): This should never get called on the main frame but it 1035 // TODO(bokan): This should never get called on the main frame but it
1036 // currently does via the Windows pan scrolling path. That should go through 1036 // currently does via the Windows pan scrolling path. That should go through
1037 // a more normalized EventHandler-like scrolling path and we should 1037 // a more normalized EventHandler-like scrolling path and we should
1038 // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should 1038 // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should
1039 // be handled by the ViewportScrollCallback. 1039 // be handled by the ViewportScrollCallback.
1040 1040
1041 if (!frameView()) 1041 if (!frameView())
1042 return ScrollResult(false, false, delta.width(), delta.height()); 1042 return ScrollResult(false, false, delta.width(), delta.height());
1043 1043
1044 return frameView()->getScrollableArea()->userScroll(granularity, delta); 1044 return frameView()->getScrollableArea()->userScroll(granularity, delta);
1045 } 1045 }
1046 1046
1047 } // namespace blink 1047 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698