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

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

Issue 326753002: Fix use of LayoutStateDisabler for RenderView invalidation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add test expectations 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
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after
1624 if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea() ) { 1624 if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea() ) {
1625 if (area->hasVerticalBarDamage()) 1625 if (area->hasVerticalBarDamage())
1626 repaintRectangle(area->verticalBarDamage()); 1626 repaintRectangle(area->verticalBarDamage());
1627 if (area->hasHorizontalBarDamage()) 1627 if (area->hasHorizontalBarDamage())
1628 repaintRectangle(area->horizontalBarDamage()); 1628 repaintRectangle(area->horizontalBarDamage());
1629 area->resetScrollbarDamage(); 1629 area->resetScrollbarDamage();
1630 } 1630 }
1631 } 1631 }
1632 1632
1633 // FIXME: LayoutState should be enabled for other paint invalidation contain ers than the RenderView. crbug.com/363834 1633 // FIXME: LayoutState should be enabled for other paint invalidation contain ers than the RenderView. crbug.com/363834
1634 if (establishesNewPaintInvalidationContainer) { 1634 if (establishesNewPaintInvalidationContainer && !isRenderView()) {
1635 LayoutStateDisabler disabler(*this); 1635 LayoutStateDisabler disabler(*this);
1636 RenderObject::invalidateTreeAfterLayout(newPaintInvalidationContainer); 1636 RenderObject::invalidateTreeAfterLayout(newPaintInvalidationContainer);
1637 } else { 1637 } else {
1638 // FIXME: This concept of a tree walking state for fast lookups should b e generalized away from 1638 // FIXME: This concept of a tree walking state for fast lookups should b e generalized away from
1639 // just layout. 1639 // just layout.
1640 // FIXME: Table rows shouldn't be special-cased. 1640 // FIXME: Table rows shouldn't be special-cased.
1641 LayoutStateMaintainer statePusher(*this, isTableRow() ? LayoutSize() : l ocationOffset()); 1641 LayoutStateMaintainer statePusher(*this, isTableRow() ? LayoutSize() : l ocationOffset());
1642 RenderObject::invalidateTreeAfterLayout(newPaintInvalidationContainer); 1642 RenderObject::invalidateTreeAfterLayout(newPaintInvalidationContainer);
1643 } 1643 }
1644 } 1644 }
(...skipping 3050 matching lines...) Expand 10 before | Expand all | Expand 10 after
4695 return 0; 4695 return 0;
4696 4696
4697 if (!layoutState && !flowThreadContainingBlock()) 4697 if (!layoutState && !flowThreadContainingBlock())
4698 return 0; 4698 return 0;
4699 4699
4700 RenderBlock* containerBlock = containingBlock(); 4700 RenderBlock* containerBlock = containingBlock();
4701 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4701 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4702 } 4702 }
4703 4703
4704 } // namespace WebCore 4704 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698