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

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: Blind fix for Mac. 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 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 // they are positioned correctly. In the virtual-viewport pinch mode frame r ect changes wont 1287 // they are positioned correctly. In the virtual-viewport pinch mode frame r ect changes wont
1288 // necessarily cause a layout size change so only take this early-out if we' re in old-style 1288 // necessarily cause a layout size change so only take this early-out if we' re in old-style
1289 // pinch. 1289 // pinch.
1290 if (m_frame->settings() 1290 if (m_frame->settings()
1291 && !m_frame->settings()->viewportEnabled() 1291 && !m_frame->settings()->viewportEnabled()
1292 && !m_frame->settings()->pinchVirtualViewportEnabled()) 1292 && !m_frame->settings()->pinchVirtualViewportEnabled())
1293 return; 1293 return;
1294 1294
1295 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) { 1295 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) {
1296 RenderObject* renderer = viewportConstrainedObject; 1296 RenderObject* renderer = viewportConstrainedObject;
1297 RenderStyle* style = renderer->style(); 1297 const RenderStyle* style = renderer->style();
1298 if (widthChanged) { 1298 if (widthChanged) {
1299 if (style->width().isFixed() && (style->left().isAuto() || style->ri ght().isAuto())) 1299 if (style->width().isFixed() && (style->left().isAuto() || style->ri ght().isAuto()))
1300 renderer->setNeedsPositionedMovementLayout(); 1300 renderer->setNeedsPositionedMovementLayout();
1301 else 1301 else
1302 renderer->setNeedsLayoutAndFullPaintInvalidation(); 1302 renderer->setNeedsLayoutAndFullPaintInvalidation();
1303 } 1303 }
1304 if (heightChanged) { 1304 if (heightChanged) {
1305 if (style->height().isFixed() && (style->top().isAuto() || style->bo ttom().isAuto())) 1305 if (style->height().isFixed() && (style->top().isAuto() || style->bo ttom().isAuto()))
1306 renderer->setNeedsPositionedMovementLayout(); 1306 renderer->setNeedsPositionedMovementLayout();
1307 else 1307 else
(...skipping 2720 matching lines...) Expand 10 before | Expand all | Expand 10 after
4028 return; 4028 return;
4029 4029
4030 ScrollableArea::setScrollOrigin(origin); 4030 ScrollableArea::setScrollOrigin(origin);
4031 4031
4032 // Update if the scroll origin changes, since our position will be different if the content size did not change. 4032 // Update if the scroll origin changes, since our position will be different if the content size did not change.
4033 if (updatePositionAtAll && updatePositionSynchronously) 4033 if (updatePositionAtAll && updatePositionSynchronously)
4034 updateScrollbars(scrollOffsetDouble()); 4034 updateScrollbars(scrollOffsetDouble());
4035 } 4035 }
4036 4036
4037 } // namespace blink 4037 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698