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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master Created 5 years, 9 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) 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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 422
423 if (m_fullScreenRenderer) 423 if (m_fullScreenRenderer)
424 m_fullScreenRenderer->unwrapRenderer(); 424 m_fullScreenRenderer->unwrapRenderer();
425 425
426 m_fullScreenElement = element; 426 m_fullScreenElement = element;
427 427
428 // Create a placeholder block for a the full-screen element, to keep the pag e from reflowing 428 // Create a placeholder block for a the full-screen element, to keep the pag e from reflowing
429 // when the element is removed from the normal flow. Only do this for a Layo utBox, as only 429 // when the element is removed from the normal flow. Only do this for a Layo utBox, as only
430 // a box will have a frameRect. The placeholder will be created in setFullSc reenRenderer() 430 // a box will have a frameRect. The placeholder will be created in setFullSc reenRenderer()
431 // during layout. 431 // during layout.
432 LayoutObject* renderer = m_fullScreenElement->renderer(); 432 LayoutObject* renderer = m_fullScreenElement->layoutObject();
Julien - ping for review 2015/03/05 16:19:15 Ditto.
433 bool shouldCreatePlaceholder = renderer && renderer->isBox(); 433 bool shouldCreatePlaceholder = renderer && renderer->isBox();
434 if (shouldCreatePlaceholder) { 434 if (shouldCreatePlaceholder) {
435 m_savedPlaceholderFrameRect = toLayoutBox(renderer)->frameRect(); 435 m_savedPlaceholderFrameRect = toLayoutBox(renderer)->frameRect();
436 m_savedPlaceholderLayoutStyle = LayoutStyle::clone(renderer->styleRef()) ; 436 m_savedPlaceholderLayoutStyle = LayoutStyle::clone(renderer->styleRef()) ;
437 } 437 }
438 438
439 if (m_fullScreenElement != document()->documentElement()) 439 if (m_fullScreenElement != document()->documentElement())
440 LayoutFullScreen::wrapRenderer(renderer, renderer ? renderer->parent() : 0, document()); 440 LayoutFullScreen::wrapRenderer(renderer, renderer ? renderer->parent() : 0, document());
441 441
442 m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBou ndaries(true); 442 m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBou ndaries(true);
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 DEFINE_TRACE(Fullscreen) 605 DEFINE_TRACE(Fullscreen)
606 { 606 {
607 visitor->trace(m_fullScreenElement); 607 visitor->trace(m_fullScreenElement);
608 visitor->trace(m_fullScreenElementStack); 608 visitor->trace(m_fullScreenElementStack);
609 visitor->trace(m_eventQueue); 609 visitor->trace(m_eventQueue);
610 DocumentSupplement::trace(visitor); 610 DocumentSupplement::trace(visitor);
611 DocumentLifecycleObserver::trace(visitor); 611 DocumentLifecycleObserver::trace(visitor);
612 } 612 }
613 613
614 } // namespace blink 614 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698