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

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

Powered by Google App Engine
This is Rietveld 408576698