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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2692853016: Change PaintLayer::m_layoutObject to a reference. (Closed)
Patch Set: Added TODO Created 3 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 this); 1567 this);
1568 1568
1569 // Ensure main thread scrolling reasons are recomputed. 1569 // Ensure main thread scrolling reasons are recomputed.
1570 if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) { 1570 if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
1571 setNeedsPaintPropertyUpdate(); 1571 setNeedsPaintPropertyUpdate();
1572 // The object's scroll properties are not affected by its own background. 1572 // The object's scroll properties are not affected by its own background.
1573 object->setAncestorsNeedPaintPropertyUpdateForMainThreadScrolling(); 1573 object->setAncestorsNeedPaintPropertyUpdateForMainThreadScrolling();
1574 } 1574 }
1575 } 1575 }
1576 1576
1577 void FrameView::addViewportConstrainedObject(LayoutObject* object) { 1577 void FrameView::addViewportConstrainedObject(LayoutObject& object) {
1578 if (!m_viewportConstrainedObjects) { 1578 if (!m_viewportConstrainedObjects) {
1579 m_viewportConstrainedObjects = 1579 m_viewportConstrainedObjects =
1580 WTF::wrapUnique(new ViewportConstrainedObjectSet); 1580 WTF::wrapUnique(new ViewportConstrainedObjectSet);
1581 } 1581 }
1582 1582
1583 if (!m_viewportConstrainedObjects->contains(object)) { 1583 if (!m_viewportConstrainedObjects->contains(&object)) {
1584 m_viewportConstrainedObjects->insert(object); 1584 m_viewportConstrainedObjects->insert(&object);
1585 1585
1586 if (ScrollingCoordinator* scrollingCoordinator = 1586 if (ScrollingCoordinator* scrollingCoordinator =
1587 this->scrollingCoordinator()) 1587 this->scrollingCoordinator())
1588 scrollingCoordinator->frameViewFixedObjectsDidChange(this); 1588 scrollingCoordinator->frameViewFixedObjectsDidChange(this);
1589 } 1589 }
1590 } 1590 }
1591 1591
1592 void FrameView::removeViewportConstrainedObject(LayoutObject* object) { 1592 void FrameView::removeViewportConstrainedObject(LayoutObject& object) {
1593 if (m_viewportConstrainedObjects && 1593 if (m_viewportConstrainedObjects &&
1594 m_viewportConstrainedObjects->contains(object)) { 1594 m_viewportConstrainedObjects->contains(&object)) {
1595 m_viewportConstrainedObjects->erase(object); 1595 m_viewportConstrainedObjects->erase(&object);
1596 1596
1597 if (ScrollingCoordinator* scrollingCoordinator = 1597 if (ScrollingCoordinator* scrollingCoordinator =
1598 this->scrollingCoordinator()) 1598 this->scrollingCoordinator())
1599 scrollingCoordinator->frameViewFixedObjectsDidChange(this); 1599 scrollingCoordinator->frameViewFixedObjectsDidChange(this);
1600 } 1600 }
1601 } 1601 }
1602 1602
1603 void FrameView::viewportSizeChanged(bool widthChanged, bool heightChanged) { 1603 void FrameView::viewportSizeChanged(bool widthChanged, bool heightChanged) {
1604 DCHECK(widthChanged || heightChanged); 1604 DCHECK(widthChanged || heightChanged);
1605 DCHECK(m_frame->host()); 1605 DCHECK(m_frame->host());
(...skipping 3585 matching lines...) Expand 10 before | Expand all | Expand 10 after
5191 void FrameView::setAnimationHost( 5191 void FrameView::setAnimationHost(
5192 std::unique_ptr<CompositorAnimationHost> host) { 5192 std::unique_ptr<CompositorAnimationHost> host) {
5193 m_animationHost = std::move(host); 5193 m_animationHost = std::move(host);
5194 } 5194 }
5195 5195
5196 LayoutUnit FrameView::caretWidth() const { 5196 LayoutUnit FrameView::caretWidth() const {
5197 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5197 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5198 } 5198 }
5199 5199
5200 } // namespace blink 5200 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698