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

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

Issue 453113002: RenderLayer::hasVisibleContent should ASSERT(!m_visibleContentStatusDirty) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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) 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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2082 matching lines...) Expand 10 before | Expand all | Expand 10 after
2093 || m_style->hasAutoZIndex() != newStyle.hasAutoZIndex(); 2093 || m_style->hasAutoZIndex() != newStyle.hasAutoZIndex();
2094 if (visibilityChanged) { 2094 if (visibilityChanged) {
2095 document().setAnnotatedRegionsDirty(true); 2095 document().setAnnotatedRegionsDirty(true);
2096 if (AXObjectCache* cache = document().existingAXObjectCache()) 2096 if (AXObjectCache* cache = document().existingAXObjectCache())
2097 cache->childrenChanged(parent()); 2097 cache->childrenChanged(parent());
2098 } 2098 }
2099 2099
2100 // Keep layer hierarchy visibility bits up to date if visibility changes . 2100 // Keep layer hierarchy visibility bits up to date if visibility changes .
2101 if (m_style->visibility() != newStyle.visibility()) { 2101 if (m_style->visibility() != newStyle.visibility()) {
2102 // We might not have an enclosing layer yet because we might not be in the tree. 2102 // We might not have an enclosing layer yet because we might not be in the tree.
2103 if (RenderLayer* layer = enclosingLayer()) { 2103 if (RenderLayer* layer = enclosingLayer())
2104 if (newStyle.visibility() == VISIBLE) { 2104 layer->potentiallyDirtyVisibleContentStatus(newStyle.visibility( ));
2105 layer->setHasVisibleContent();
2106 } else if (layer->hasVisibleContent() && (this == layer->rendere r() || layer->renderer()->style()->visibility() != VISIBLE)) {
2107 layer->dirtyVisibleContentStatus();
2108 }
2109 }
2110 } 2105 }
2111 2106
2112 if (isFloating() && (m_style->floating() != newStyle.floating())) 2107 if (isFloating() && (m_style->floating() != newStyle.floating()))
2113 // For changes in float styles, we need to conceivably remove oursel ves 2108 // For changes in float styles, we need to conceivably remove oursel ves
2114 // from the floating objects list. 2109 // from the floating objects list.
2115 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists(); 2110 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists();
2116 else if (isOutOfFlowPositioned() && (m_style->position() != newStyle.pos ition())) 2111 else if (isOutOfFlowPositioned() && (m_style->position() != newStyle.pos ition()))
2117 // For changes in positioning styles, we need to conceivably remove ourselves 2112 // For changes in positioning styles, we need to conceivably remove ourselves
2118 // from the positioned objects list. 2113 // from the positioned objects list.
2119 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists(); 2114 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists();
(...skipping 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after
3451 { 3446 {
3452 if (object1) { 3447 if (object1) {
3453 const blink::RenderObject* root = object1; 3448 const blink::RenderObject* root = object1;
3454 while (root->parent()) 3449 while (root->parent())
3455 root = root->parent(); 3450 root = root->parent();
3456 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3451 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3457 } 3452 }
3458 } 3453 }
3459 3454
3460 #endif 3455 #endif
OLDNEW
« Source/core/rendering/RenderLayer.h ('K') | « Source/core/rendering/RenderLayer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698