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

Side by Side Diff: sky/engine/core/rendering/RenderView.cpp

Issue 714783003: Remove some straggling zoom-related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 156 }
157 } 157 }
158 158
159 return false; 159 return false;
160 } 160 }
161 161
162 void RenderView::layout() 162 void RenderView::layout()
163 { 163 {
164 SubtreeLayoutScope layoutScope(*this); 164 SubtreeLayoutScope layoutScope(*this);
165 165
166 // Use calcWidth/Height to get the new width/height, since this will take th e full page zoom factor into account.
167 bool relayoutChildren = (!m_frameView || width() != viewWidth() || height() != viewHeight()); 166 bool relayoutChildren = (!m_frameView || width() != viewWidth() || height() != viewHeight());
168 if (relayoutChildren) { 167 if (relayoutChildren) {
169 layoutScope.setChildNeedsLayout(this); 168 layoutScope.setChildNeedsLayout(this);
170 for (RenderObject* child = firstChild(); child; child = child->nextSibli ng()) { 169 for (RenderObject* child = firstChild(); child; child = child->nextSibli ng()) {
171 if ((child->isBox() && toRenderBox(child)->hasRelativeLogicalHeight( )) 170 if ((child->isBox() && toRenderBox(child)->hasRelativeLogicalHeight( ))
172 || child->style()->logicalHeight().isPercent() 171 || child->style()->logicalHeight().isPercent()
173 || child->style()->logicalMinHeight().isPercent() 172 || child->style()->logicalMinHeight().isPercent()
174 || child->style()->logicalMaxHeight().isPercent()) 173 || child->style()->logicalMaxHeight().isPercent())
175 layoutScope.setChildNeedsLayout(child); 174 layoutScope.setChildNeedsLayout(child);
176 } 175 }
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 return viewWidth(IncludeScrollbars); 755 return viewWidth(IncludeScrollbars);
757 } 756 }
758 757
759 // FIXME(sky): remove 758 // FIXME(sky): remove
760 double RenderView::layoutViewportHeight() const 759 double RenderView::layoutViewportHeight() const
761 { 760 {
762 return viewHeight(IncludeScrollbars); 761 return viewHeight(IncludeScrollbars);
763 } 762 }
764 763
765 } // namespace blink 764 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderReplaced.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698