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

Side by Side Diff: Source/core/rendering/RenderLayerRepainter.cpp

Issue 335963002: Change LayoutState to be stack-allocated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix push function to match old behavior... Created 6 years, 6 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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 // FIXME: really, we're in the repaint phase here, and the following queries are legal. 65 // FIXME: really, we're in the repaint phase here, and the following queries are legal.
66 // Until those states are fully fledged, I'll just disable the ASSERTS. 66 // Until those states are fully fledged, I'll just disable the ASSERTS.
67 DisableCompositingQueryAsserts disabler; 67 DisableCompositingQueryAsserts disabler;
68 if (m_renderer.layer()->hasVisibleContent()) { 68 if (m_renderer.layer()->hasVisibleContent()) {
69 RenderView* view = m_renderer.view(); 69 RenderView* view = m_renderer.view();
70 ASSERT(view); 70 ASSERT(view);
71 // FIXME: LayoutState does not work with RenderLayers as there is not a 1-to-1 71 // FIXME: LayoutState does not work with RenderLayers as there is not a 1-to-1
72 // mapping between them and the RenderObjects. It would be neat to enabl e 72 // mapping between them and the RenderObjects. It would be neat to enabl e
73 // LayoutState outside the layout() phase and use it here. 73 // LayoutState outside the layout() phase and use it here.
74 ASSERT(!view->layoutStateEnabled()); 74 ASSERT(!view->layoutStateCachedOffsetsEnabled());
75 75
76 const RenderLayerModelObject* repaintContainer = m_renderer.containerFor PaintInvalidation(); 76 const RenderLayerModelObject* repaintContainer = m_renderer.containerFor PaintInvalidation();
77 LayoutRect oldRepaintRect = m_repaintRect; 77 LayoutRect oldRepaintRect = m_repaintRect;
78 LayoutPoint oldOffset = m_offset; 78 LayoutPoint oldOffset = m_offset;
79 computeRepaintRects(); 79 computeRepaintRects();
80 shouldCheckForRepaint &= shouldRepaintLayer(); 80 shouldCheckForRepaint &= shouldRepaintLayer();
81 81
82 if (shouldCheckForRepaint) { 82 if (shouldCheckForRepaint) {
83 if (view && !view->document().printing()) { 83 if (view && !view->document().printing()) {
84 if (m_repaintStatus & NeedsFullRepaint) { 84 if (m_repaintStatus & NeedsFullRepaint) {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 RenderLayer* RenderLayerRepainter::enclosingFilterRepaintLayer() const 256 RenderLayer* RenderLayerRepainter::enclosingFilterRepaintLayer() const
257 { 257 {
258 for (const RenderLayer* curr = m_renderer.layer(); curr; curr = curr->parent ()) { 258 for (const RenderLayer* curr = m_renderer.layer(); curr; curr = curr->parent ()) {
259 if ((curr != m_renderer.layer() && curr->requiresFullLayerImageForFilter s()) || curr->compositingState() == PaintsIntoOwnBacking || curr->isRootLayer()) 259 if ((curr != m_renderer.layer() && curr->requiresFullLayerImageForFilter s()) || curr->compositingState() == PaintsIntoOwnBacking || curr->isRootLayer())
260 return const_cast<RenderLayer*>(curr); 260 return const_cast<RenderLayer*>(curr);
261 } 261 }
262 return 0; 262 return 0;
263 } 263 }
264 264
265 } // Namespace WebCore 265 } // Namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698