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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after Doug's review. 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 | Annotate | Revision Log
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 1279 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 // they are positioned correctly. In the virtual-viewport pinch mode frame r ect changes wont 1290 // they are positioned correctly. In the virtual-viewport pinch mode frame r ect changes wont
1291 // necessarily cause a layout size change so only take this early-out if we' re in old-style 1291 // necessarily cause a layout size change so only take this early-out if we' re in old-style
1292 // pinch. 1292 // pinch.
1293 if (m_frame->settings() 1293 if (m_frame->settings()
1294 && !m_frame->settings()->viewportEnabled() 1294 && !m_frame->settings()->viewportEnabled()
1295 && !m_frame->settings()->pinchVirtualViewportEnabled()) 1295 && !m_frame->settings()->pinchVirtualViewportEnabled())
1296 return; 1296 return;
1297 1297
1298 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) { 1298 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) {
1299 LayoutObject* renderer = viewportConstrainedObject; 1299 LayoutObject* renderer = viewportConstrainedObject;
1300 LayoutStyle* style = renderer->style(); 1300 const LayoutStyle& style = renderer->styleRef();
1301 if (widthChanged) { 1301 if (widthChanged) {
1302 if (style->width().isFixed() && (style->left().isAuto() || style->ri ght().isAuto())) 1302 if (style.width().isFixed() && (style.left().isAuto() || style.right ().isAuto()))
1303 renderer->setNeedsPositionedMovementLayout(); 1303 renderer->setNeedsPositionedMovementLayout();
1304 else 1304 else
1305 renderer->setNeedsLayoutAndFullPaintInvalidation(); 1305 renderer->setNeedsLayoutAndFullPaintInvalidation();
1306 } 1306 }
1307 if (heightChanged) { 1307 if (heightChanged) {
1308 if (style->height().isFixed() && (style->top().isAuto() || style->bo ttom().isAuto())) 1308 if (style.height().isFixed() && (style.top().isAuto() || style.botto m().isAuto()))
1309 renderer->setNeedsPositionedMovementLayout(); 1309 renderer->setNeedsPositionedMovementLayout();
1310 else 1310 else
1311 renderer->setNeedsLayoutAndFullPaintInvalidation(); 1311 renderer->setNeedsLayoutAndFullPaintInvalidation();
1312 } 1312 }
1313 } 1313 }
1314 } 1314 }
1315 1315
1316 IntSize FrameView::scrollOffsetForViewportConstrainedObjects() const 1316 IntSize FrameView::scrollOffsetForViewportConstrainedObjects() const
1317 { 1317 {
1318 return roundedIntSize(viewportConstrainedVisibleContentRect().location()); 1318 return roundedIntSize(viewportConstrainedVisibleContentRect().location());
(...skipping 2735 matching lines...) Expand 10 before | Expand all | Expand 10 after
4054 { 4054 {
4055 Settings* settings = frame().settings(); 4055 Settings* settings = frame().settings();
4056 if (!settings || !settings->rootLayerScrolls()) 4056 if (!settings || !settings->rootLayerScrolls())
4057 return this; 4057 return this;
4058 4058
4059 RenderView* renderView = this->renderView(); 4059 RenderView* renderView = this->renderView();
4060 return renderView ? renderView->scrollableArea() : nullptr; 4060 return renderView ? renderView->scrollableArea() : nullptr;
4061 } 4061 }
4062 4062
4063 } // namespace blink 4063 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/iterators/TextIterator.cpp ('k') | Source/core/html/HTMLFormControlElementTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698