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

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

Issue 2199783002: Clarify fullscreenElement vs. currentFullScreenElement distinction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 1462
1463 return InsertionDone; 1463 return InsertionDone;
1464 } 1464 }
1465 1465
1466 void Element::removedFrom(ContainerNode* insertionPoint) 1466 void Element::removedFrom(ContainerNode* insertionPoint)
1467 { 1467 {
1468 bool wasInDocument = insertionPoint->isConnected(); 1468 bool wasInDocument = insertionPoint->isConnected();
1469 1469
1470 DCHECK(!hasRareData() || !elementRareData()->hasPseudoElements()); 1470 DCHECK(!hasRareData() || !elementRareData()->hasPseudoElements());
1471 1471
1472 if (Fullscreen::isActiveFullScreenElement(*this)) { 1472 if (Fullscreen::isCurrentFullScreenElement(*this)) {
1473 setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false); 1473 setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
1474 if (insertionPoint->isElementNode()) { 1474 if (insertionPoint->isElementNode()) {
1475 toElement(insertionPoint)->setContainsFullScreenElement(false); 1475 toElement(insertionPoint)->setContainsFullScreenElement(false);
1476 toElement(insertionPoint)->setContainsFullScreenElementOnAncestorsCr ossingFrameBoundaries(false); 1476 toElement(insertionPoint)->setContainsFullScreenElementOnAncestorsCr ossingFrameBoundaries(false);
1477 } 1477 }
1478 } 1478 }
1479 1479
1480 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(document())) 1480 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(document()))
1481 fullscreen->elementRemoved(*this); 1481 fullscreen->elementRemoved(*this);
1482 1482
(...skipping 2207 matching lines...) Expand 10 before | Expand all | Expand 10 after
3690 if (this == document().cssTarget()) 3690 if (this == document().cssTarget())
3691 return false; 3691 return false;
3692 if (isHTMLElement() && toHTMLElement(this)->hasDirectionAuto()) 3692 if (isHTMLElement() && toHTMLElement(this)->hasDirectionAuto())
3693 return false; 3693 return false;
3694 // TODO(kochi): This prevents any slotted elements from sharing styles. 3694 // TODO(kochi): This prevents any slotted elements from sharing styles.
3695 // Investigate cases where we share styles to optimize styling performance. 3695 // Investigate cases where we share styles to optimize styling performance.
3696 if (isChildOfV1ShadowHost()) 3696 if (isChildOfV1ShadowHost())
3697 return false; 3697 return false;
3698 if (hasAnimations()) 3698 if (hasAnimations())
3699 return false; 3699 return false;
3700 if (Fullscreen::isActiveFullScreenElement(*this)) 3700 if (Fullscreen::isCurrentFullScreenElement(*this))
3701 return false; 3701 return false;
3702 return true; 3702 return true;
3703 } 3703 }
3704 3704
3705 void Element::logAddElementIfIsolatedWorldAndInDocument(const char element[], co nst QualifiedName& attr1) 3705 void Element::logAddElementIfIsolatedWorldAndInDocument(const char element[], co nst QualifiedName& attr1)
3706 { 3706 {
3707 if (!isConnected()) 3707 if (!isConnected())
3708 return; 3708 return;
3709 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld(); 3709 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld();
3710 if (!activityLogger) 3710 if (!activityLogger)
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
3769 3769
3770 DEFINE_TRACE_WRAPPERS(Element) 3770 DEFINE_TRACE_WRAPPERS(Element)
3771 { 3771 {
3772 if (hasRareData()) { 3772 if (hasRareData()) {
3773 visitor->traceWrappers(elementRareData()); 3773 visitor->traceWrappers(elementRareData());
3774 } 3774 }
3775 ContainerNode::traceWrappers(visitor); 3775 ContainerNode::traceWrappers(visitor);
3776 } 3776 }
3777 3777
3778 } // namespace blink 3778 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/DocumentFullscreen.idl ('k') | third_party/WebKit/Source/core/dom/Fullscreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698