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

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

Issue 737523002: Sky: Move iframe geometry updates to FrameView::updateLayout instead of (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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 { 292 {
293 ASSERT(!needsLayout()); 293 ASSERT(!needsLayout());
294 294
295 // We specifically need to issue paint invalidations for the viewRect since other renderers 295 // We specifically need to issue paint invalidations for the viewRect since other renderers
296 // short-circuit on full-paint invalidation. 296 // short-circuit on full-paint invalidation.
297 LayoutRect dirtyRect = viewRect(); 297 LayoutRect dirtyRect = viewRect();
298 if (doingFullPaintInvalidation() && !dirtyRect.isEmpty()) { 298 if (doingFullPaintInvalidation() && !dirtyRect.isEmpty()) {
299 const RenderLayerModelObject* paintInvalidationContainer = &paintInvalid ationState.paintInvalidationContainer(); 299 const RenderLayerModelObject* paintInvalidationContainer = &paintInvalid ationState.paintInvalidationContainer();
300 mapRectToPaintInvalidationBacking(paintInvalidationContainer, dirtyRect, &paintInvalidationState); 300 mapRectToPaintInvalidationBacking(paintInvalidationContainer, dirtyRect, &paintInvalidationState);
301 invalidatePaintUsingContainer(paintInvalidationContainer, dirtyRect, Inv alidationFull); 301 invalidatePaintUsingContainer(paintInvalidationContainer, dirtyRect, Inv alidationFull);
302
303 // Also need to handle iframes, since they have a separate view outside
304 // the hierarchy.
305 for (auto& iframe: m_iframes)
306 iframe->invalidateWidgetBounds();
307 } 302 }
308 RenderBlock::invalidateTreeIfNeeded(paintInvalidationState); 303 RenderBlock::invalidateTreeIfNeeded(paintInvalidationState);
309 } 304 }
310 305
311 void RenderView::invalidatePaintForRectangle(const LayoutRect& paintInvalidation Rect) const 306 void RenderView::invalidatePaintForRectangle(const LayoutRect& paintInvalidation Rect) const
312 { 307 {
313 ASSERT(!paintInvalidationRect.isEmpty()); 308 ASSERT(!paintInvalidationRect.isEmpty());
314 309
315 if (!m_frameView) 310 if (!m_frameView)
316 return; 311 return;
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 { 747 {
753 return viewWidth(IncludeScrollbars); 748 return viewWidth(IncludeScrollbars);
754 } 749 }
755 750
756 // FIXME(sky): remove 751 // FIXME(sky): remove
757 double RenderView::layoutViewportHeight() const 752 double RenderView::layoutViewportHeight() const
758 { 753 {
759 return viewHeight(IncludeScrollbars); 754 return viewHeight(IncludeScrollbars);
760 } 755 }
761 756
762 void RenderView::addIFrame(RenderIFrame* iframe)
763 {
764 m_iframes.add(iframe);
765 }
766
767 void RenderView::removeIFrame(RenderIFrame* iframe)
768 {
769 m_iframes.remove(iframe);
770 }
771
772 } // namespace blink 757 } // namespace blink
OLDNEW
« sky/engine/core/frame/FrameView.cpp ('K') | « sky/engine/core/rendering/RenderView.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698