| 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 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 24 matching lines...) Expand all Loading... |
| 35 #include "core/events/Event.h" | 35 #include "core/events/Event.h" |
| 36 #include "core/frame/FrameHost.h" | 36 #include "core/frame/FrameHost.h" |
| 37 #include "core/frame/LocalFrame.h" | 37 #include "core/frame/LocalFrame.h" |
| 38 #include "core/frame/OriginsUsingFeatures.h" | 38 #include "core/frame/OriginsUsingFeatures.h" |
| 39 #include "core/frame/Settings.h" | 39 #include "core/frame/Settings.h" |
| 40 #include "core/frame/UseCounter.h" | 40 #include "core/frame/UseCounter.h" |
| 41 #include "core/html/HTMLIFrameElement.h" | 41 #include "core/html/HTMLIFrameElement.h" |
| 42 #include "core/html/HTMLMediaElement.h" | 42 #include "core/html/HTMLMediaElement.h" |
| 43 #include "core/input/EventHandler.h" | 43 #include "core/input/EventHandler.h" |
| 44 #include "core/inspector/ConsoleMessage.h" | 44 #include "core/inspector/ConsoleMessage.h" |
| 45 #include "core/layout/LayoutBlockFlow.h" |
| 45 #include "core/layout/LayoutFullScreen.h" | 46 #include "core/layout/LayoutFullScreen.h" |
| 46 #include "core/layout/api/LayoutFullScreenItem.h" | 47 #include "core/layout/api/LayoutFullScreenItem.h" |
| 47 #include "core/page/ChromeClient.h" | 48 #include "core/page/ChromeClient.h" |
| 48 #include "platform/UserGestureIndicator.h" | 49 #include "platform/UserGestureIndicator.h" |
| 49 | 50 |
| 50 namespace blink { | 51 namespace blink { |
| 51 | 52 |
| 52 using namespace HTMLNames; | 53 using namespace HTMLNames; |
| 53 | 54 |
| 54 static bool fullscreenIsAllowedForAllOwners(const Document& document) | 55 static bool fullscreenIsAllowedForAllOwners(const Document& document) |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 } | 492 } |
| 492 | 493 |
| 493 void Fullscreen::setFullScreenLayoutObject(LayoutFullScreen* layoutObject) | 494 void Fullscreen::setFullScreenLayoutObject(LayoutFullScreen* layoutObject) |
| 494 { | 495 { |
| 495 if (layoutObject == m_fullScreenLayoutObject) | 496 if (layoutObject == m_fullScreenLayoutObject) |
| 496 return; | 497 return; |
| 497 | 498 |
| 498 if (layoutObject && m_savedPlaceholderComputedStyle) { | 499 if (layoutObject && m_savedPlaceholderComputedStyle) { |
| 499 layoutObject->createPlaceholder(m_savedPlaceholderComputedStyle.release(
), m_savedPlaceholderFrameRect); | 500 layoutObject->createPlaceholder(m_savedPlaceholderComputedStyle.release(
), m_savedPlaceholderFrameRect); |
| 500 } else if (layoutObject && m_fullScreenLayoutObject && m_fullScreenLayoutObj
ect->placeholder()) { | 501 } else if (layoutObject && m_fullScreenLayoutObject && m_fullScreenLayoutObj
ect->placeholder()) { |
| 501 LayoutBlock* placeholder = m_fullScreenLayoutObject->placeholder(); | 502 LayoutBlockFlow* placeholder = m_fullScreenLayoutObject->placeholder(); |
| 502 layoutObject->createPlaceholder(ComputedStyle::clone(placeholder->styleR
ef()), placeholder->frameRect()); | 503 layoutObject->createPlaceholder(ComputedStyle::clone(placeholder->styleR
ef()), placeholder->frameRect()); |
| 503 } | 504 } |
| 504 | 505 |
| 505 if (m_fullScreenLayoutObject) | 506 if (m_fullScreenLayoutObject) |
| 506 m_fullScreenLayoutObject->unwrapLayoutObject(); | 507 m_fullScreenLayoutObject->unwrapLayoutObject(); |
| 507 DCHECK(!m_fullScreenLayoutObject); | 508 DCHECK(!m_fullScreenLayoutObject); |
| 508 | 509 |
| 509 m_fullScreenLayoutObject = layoutObject; | 510 m_fullScreenLayoutObject = layoutObject; |
| 510 } | 511 } |
| 511 | 512 |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 DEFINE_TRACE(Fullscreen) | 608 DEFINE_TRACE(Fullscreen) |
| 608 { | 609 { |
| 609 visitor->trace(m_fullScreenElement); | 610 visitor->trace(m_fullScreenElement); |
| 610 visitor->trace(m_fullScreenElementStack); | 611 visitor->trace(m_fullScreenElementStack); |
| 611 visitor->trace(m_eventQueue); | 612 visitor->trace(m_eventQueue); |
| 612 Supplement<Document>::trace(visitor); | 613 Supplement<Document>::trace(visitor); |
| 613 ContextLifecycleObserver::trace(visitor); | 614 ContextLifecycleObserver::trace(visitor); |
| 614 } | 615 } |
| 615 | 616 |
| 616 } // namespace blink | 617 } // namespace blink |
| OLD | NEW |