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

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: Slightly less 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
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('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) 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 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after
2114 if (AXObjectCache* cache = document().existingAXObjectCache()) 2114 if (AXObjectCache* cache = document().existingAXObjectCache())
2115 cache->childrenChanged(parent()); 2115 cache->childrenChanged(parent());
2116 } 2116 }
2117 2117
2118 // Keep layer hierarchy visibility bits up to date if visibility changes . 2118 // Keep layer hierarchy visibility bits up to date if visibility changes .
2119 if (m_style->visibility() != newStyle.visibility()) { 2119 if (m_style->visibility() != newStyle.visibility()) {
2120 // We might not have an enclosing layer yet because we might not be in the tree. 2120 // We might not have an enclosing layer yet because we might not be in the tree.
2121 if (RenderLayer* layer = enclosingLayer()) { 2121 if (RenderLayer* layer = enclosingLayer()) {
2122 if (newStyle.visibility() == VISIBLE) { 2122 if (newStyle.visibility() == VISIBLE) {
2123 layer->setHasVisibleContent(); 2123 layer->setHasVisibleContent();
2124 } else if (layer->hasVisibleContent() && (this == layer->rendere r() || layer->renderer()->style()->visibility() != VISIBLE)) { 2124 } else {
2125 layer->dirtyVisibleContentStatus(); 2125 layer->potentiallyDirtyVisibleContentStatus(newStyle.visibil ity());
2126 } 2126 }
2127 } 2127 }
2128 } 2128 }
2129 2129
2130 if (isFloating() && (m_style->floating() != newStyle.floating())) 2130 if (isFloating() && (m_style->floating() != newStyle.floating()))
2131 // For changes in float styles, we need to conceivably remove oursel ves 2131 // For changes in float styles, we need to conceivably remove oursel ves
2132 // from the floating objects list. 2132 // from the floating objects list.
2133 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists(); 2133 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists();
2134 else if (isOutOfFlowPositioned() && (m_style->position() != newStyle.pos ition())) 2134 else if (isOutOfFlowPositioned() && (m_style->position() != newStyle.pos ition()))
2135 // For changes in positioning styles, we need to conceivably remove ourselves 2135 // For changes in positioning styles, we need to conceivably remove ourselves
(...skipping 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after
3475 { 3475 {
3476 if (object1) { 3476 if (object1) {
3477 const blink::RenderObject* root = object1; 3477 const blink::RenderObject* root = object1;
3478 while (root->parent()) 3478 while (root->parent())
3479 root = root->parent(); 3479 root = root->parent();
3480 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3480 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3481 } 3481 }
3482 } 3482 }
3483 3483
3484 #endif 3484 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698