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

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

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 m_savedPlaceholderComputedStyle = ComputedStyle::clone(layoutObject->sty leRef()); 440 m_savedPlaceholderComputedStyle = ComputedStyle::clone(layoutObject->sty leRef());
441 } 441 }
442 442
443 if (m_fullScreenElement != document()->documentElement()) 443 if (m_fullScreenElement != document()->documentElement())
444 LayoutFullScreen::wrapLayoutObject(layoutObject, layoutObject ? layoutOb ject->parent() : 0, document()); 444 LayoutFullScreen::wrapLayoutObject(layoutObject, layoutObject ? layoutOb ject->parent() : 0, document());
445 445
446 m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBou ndaries(true); 446 m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBou ndaries(true);
447 document()->styleEngine().ensureFullscreenUAStyle(); 447 document()->styleEngine().ensureFullscreenUAStyle();
448 m_fullScreenElement->pseudoStateChanged(CSSSelector::PseudoFullScreen); 448 m_fullScreenElement->pseudoStateChanged(CSSSelector::PseudoFullScreen);
449 449
450 // FIXME: This should not call updateLayoutTree. 450 // FIXME: This should not call updateStyleAndLayoutTree.
451 document()->updateLayoutTree(); 451 document()->updateStyleAndLayoutTree();
452 452
453 m_fullScreenElement->didBecomeFullscreenElement(); 453 m_fullScreenElement->didBecomeFullscreenElement();
454 454
455 if (document()->frame()) 455 if (document()->frame())
456 document()->frame()->eventHandler().scheduleHoverStateUpdate(); 456 document()->frame()->eventHandler().scheduleHoverStateUpdate();
457 457
458 m_eventQueueTimer.startOneShot(0, BLINK_FROM_HERE); 458 m_eventQueueTimer.startOneShot(0, BLINK_FROM_HERE);
459 } 459 }
460 460
461 void Fullscreen::didExitFullScreenForElement(Element*) 461 void Fullscreen::didExitFullScreenForElement(Element*)
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 DEFINE_TRACE(Fullscreen) 607 DEFINE_TRACE(Fullscreen)
608 { 608 {
609 visitor->trace(m_fullScreenElement); 609 visitor->trace(m_fullScreenElement);
610 visitor->trace(m_fullScreenElementStack); 610 visitor->trace(m_fullScreenElementStack);
611 visitor->trace(m_eventQueue); 611 visitor->trace(m_eventQueue);
612 Supplement<Document>::trace(visitor); 612 Supplement<Document>::trace(visitor);
613 DocumentLifecycleObserver::trace(visitor); 613 DocumentLifecycleObserver::trace(visitor);
614 } 614 }
615 615
616 } // namespace blink 616 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698