| OLD | NEW |
| 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 | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All |
| 7 * rights reserved. | 7 * rights reserved. |
| 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
| 10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 761 // allowfullscreen and fullscreen is supported, and false otherwise. | 761 // allowfullscreen and fullscreen is supported, and false otherwise. |
| 762 return allowedToUseFullscreen(document.frame()) && | 762 return allowedToUseFullscreen(document.frame()) && |
| 763 fullscreenIsSupported(document); | 763 fullscreenIsSupported(document); |
| 764 } | 764 } |
| 765 | 765 |
| 766 void Fullscreen::setFullScreenLayoutObject(LayoutFullScreen* layoutObject) { | 766 void Fullscreen::setFullScreenLayoutObject(LayoutFullScreen* layoutObject) { |
| 767 if (layoutObject == m_fullScreenLayoutObject) | 767 if (layoutObject == m_fullScreenLayoutObject) |
| 768 return; | 768 return; |
| 769 | 769 |
| 770 if (layoutObject && m_savedPlaceholderComputedStyle) { | 770 if (layoutObject && m_savedPlaceholderComputedStyle) { |
| 771 layoutObject->createPlaceholder(m_savedPlaceholderComputedStyle.release(), | 771 layoutObject->createPlaceholder(std::move(m_savedPlaceholderComputedStyle), |
| 772 m_savedPlaceholderFrameRect); | 772 m_savedPlaceholderFrameRect); |
| 773 } else if (layoutObject && m_fullScreenLayoutObject && | 773 } else if (layoutObject && m_fullScreenLayoutObject && |
| 774 m_fullScreenLayoutObject->placeholder()) { | 774 m_fullScreenLayoutObject->placeholder()) { |
| 775 LayoutBlockFlow* placeholder = m_fullScreenLayoutObject->placeholder(); | 775 LayoutBlockFlow* placeholder = m_fullScreenLayoutObject->placeholder(); |
| 776 layoutObject->createPlaceholder( | 776 layoutObject->createPlaceholder( |
| 777 ComputedStyle::clone(placeholder->styleRef()), | 777 ComputedStyle::clone(placeholder->styleRef()), |
| 778 placeholder->frameRect()); | 778 placeholder->frameRect()); |
| 779 } | 779 } |
| 780 | 780 |
| 781 if (m_fullScreenLayoutObject) | 781 if (m_fullScreenLayoutObject) |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 912 } | 912 } |
| 913 | 913 |
| 914 DEFINE_TRACE(Fullscreen) { | 914 DEFINE_TRACE(Fullscreen) { |
| 915 visitor->trace(m_pendingRequests); | 915 visitor->trace(m_pendingRequests); |
| 916 visitor->trace(m_fullscreenElementStack); | 916 visitor->trace(m_fullscreenElementStack); |
| 917 Supplement<Document>::trace(visitor); | 917 Supplement<Document>::trace(visitor); |
| 918 ContextLifecycleObserver::trace(visitor); | 918 ContextLifecycleObserver::trace(visitor); |
| 919 } | 919 } |
| 920 | 920 |
| 921 } // namespace blink | 921 } // namespace blink |
| OLD | NEW |