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

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: Fixed web/mac/WebSubstringUtil.mm 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 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 // they are positioned correctly. In the virtual-viewport pinch mode frame r ect changes wont 1292 // they are positioned correctly. In the virtual-viewport pinch mode frame r ect changes wont
1293 // necessarily cause a layout size change so only take this early-out if we' re in old-style 1293 // necessarily cause a layout size change so only take this early-out if we' re in old-style
1294 // pinch. 1294 // pinch.
1295 if (m_frame->settings() 1295 if (m_frame->settings()
1296 && !m_frame->settings()->viewportEnabled() 1296 && !m_frame->settings()->viewportEnabled()
1297 && !m_frame->settings()->pinchVirtualViewportEnabled()) 1297 && !m_frame->settings()->pinchVirtualViewportEnabled())
1298 return; 1298 return;
1299 1299
1300 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) { 1300 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) {
1301 LayoutObject* renderer = viewportConstrainedObject; 1301 LayoutObject* renderer = viewportConstrainedObject;
1302 LayoutStyle* style = renderer->style(); 1302 const LayoutStyle& style = renderer->styleRef();
1303 if (widthChanged) { 1303 if (widthChanged) {
1304 if (style->width().isFixed() && (style->left().isAuto() || style->ri ght().isAuto())) 1304 if (style.width().isFixed() && (style.left().isAuto() || style.right ().isAuto()))
1305 renderer->setNeedsPositionedMovementLayout(); 1305 renderer->setNeedsPositionedMovementLayout();
1306 else 1306 else
1307 renderer->setNeedsLayoutAndFullPaintInvalidation(); 1307 renderer->setNeedsLayoutAndFullPaintInvalidation();
1308 } 1308 }
1309 if (heightChanged) { 1309 if (heightChanged) {
1310 if (style->height().isFixed() && (style->top().isAuto() || style->bo ttom().isAuto())) 1310 if (style.height().isFixed() && (style.top().isAuto() || style.botto m().isAuto()))
1311 renderer->setNeedsPositionedMovementLayout(); 1311 renderer->setNeedsPositionedMovementLayout();
1312 else 1312 else
1313 renderer->setNeedsLayoutAndFullPaintInvalidation(); 1313 renderer->setNeedsLayoutAndFullPaintInvalidation();
1314 } 1314 }
1315 } 1315 }
1316 } 1316 }
1317 1317
1318 IntSize FrameView::scrollOffsetForViewportConstrainedObjects() const 1318 IntSize FrameView::scrollOffsetForViewportConstrainedObjects() const
1319 { 1319 {
1320 return roundedIntSize(viewportConstrainedVisibleContentRect().location()); 1320 return roundedIntSize(viewportConstrainedVisibleContentRect().location());
(...skipping 2711 matching lines...) Expand 10 before | Expand all | Expand 10 after
4032 { 4032 {
4033 Settings* settings = frame().settings(); 4033 Settings* settings = frame().settings();
4034 if (!settings || !settings->rootLayerScrolls()) 4034 if (!settings || !settings->rootLayerScrolls())
4035 return this; 4035 return this;
4036 4036
4037 RenderView* renderView = this->renderView(); 4037 RenderView* renderView = this->renderView();
4038 return renderView ? renderView->scrollableArea() : nullptr; 4038 return renderView ? renderView->scrollableArea() : nullptr;
4039 } 4039 }
4040 4040
4041 } // namespace blink 4041 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698