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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 533963002: Don't fail the style assert in Element::rendererIsFocusable if the document is active. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compile. Created 6 years, 3 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 | « no previous file | Source/web/WebLocalFrameImpl.cpp » ('j') | 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) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 return canvas->renderer() && canvas->renderer()->style()->visibility() = = VISIBLE; 230 return canvas->renderer() && canvas->renderer()->style()->visibility() = = VISIBLE;
231 } 231 }
232 232
233 // FIXME: These asserts should be in Node::isFocusable, but there are some 233 // FIXME: These asserts should be in Node::isFocusable, but there are some
234 // callsites like Document::setFocusedElement that would currently fail on 234 // callsites like Document::setFocusedElement that would currently fail on
235 // them. See crbug.com/251163 235 // them. See crbug.com/251163
236 if (!renderer()) { 236 if (!renderer()) {
237 // We can't just use needsStyleRecalc() because if the node is in a 237 // We can't just use needsStyleRecalc() because if the node is in a
238 // display:none tree it might say it needs style recalc but the whole 238 // display:none tree it might say it needs style recalc but the whole
239 // document is actually up to date. 239 // document is actually up to date.
240 ASSERT(!document().childNeedsStyleRecalc()); 240 // In addition, style cannot be cleared out for non-active documents,
241 // so in that case the childNeedsStyleRecalc check is invalid.
242 ASSERT(!document().isActive() || !document().childNeedsStyleRecalc());
241 } 243 }
242 244
243 // FIXME: Even if we are not visible, we might have a child that is visible. 245 // FIXME: Even if we are not visible, we might have a child that is visible.
244 // Hyatt wants to fix that some day with a "has visible content" flag or the like. 246 // Hyatt wants to fix that some day with a "has visible content" flag or the like.
245 if (!renderer() || renderer()->style()->visibility() != VISIBLE) 247 if (!renderer() || renderer()->style()->visibility() != VISIBLE)
246 return false; 248 return false;
247 249
248 return true; 250 return true;
249 } 251 }
250 252
(...skipping 3011 matching lines...) Expand 10 before | Expand all | Expand 10 after
3262 { 3264 {
3263 #if ENABLE(OILPAN) 3265 #if ENABLE(OILPAN)
3264 if (hasRareData()) 3266 if (hasRareData())
3265 visitor->trace(elementRareData()); 3267 visitor->trace(elementRareData());
3266 visitor->trace(m_elementData); 3268 visitor->trace(m_elementData);
3267 #endif 3269 #endif
3268 ContainerNode::trace(visitor); 3270 ContainerNode::trace(visitor);
3269 } 3271 }
3270 3272
3271 } // namespace blink 3273 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698