OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "modules/screen_orientation/ScreenOrientationController.h" | 6 #include "modules/screen_orientation/ScreenOrientationController.h" |
7 | 7 |
8 #include "core/dom/Document.h" | 8 #include "core/dom/Document.h" |
9 #include "core/frame/DOMWindow.h" | 9 #include "core/frame/DOMWindow.h" |
10 #include "core/frame/FrameView.h" | 10 #include "core/frame/FrameView.h" |
11 #include "core/frame/LocalFrame.h" | 11 #include "core/frame/LocalFrame.h" |
12 #include "core/frame/Screen.h" | 12 #include "core/frame/Screen.h" |
13 #include "core/page/Page.h" | 13 #include "core/page/Page.h" |
14 #include "platform/LayoutTestSupport.h" | 14 #include "platform/LayoutTestSupport.h" |
15 #include "platform/PlatformScreen.h" | 15 #include "platform/PlatformScreen.h" |
16 #include "public/platform/Platform.h" | 16 #include "public/platform/Platform.h" |
17 #include "public/platform/WebScreenOrientationClient.h" | 17 #include "public/platform/WebScreenOrientationClient.h" |
18 | 18 |
19 namespace WebCore { | 19 namespace WebCore { |
20 | 20 |
21 ScreenOrientationController::~ScreenOrientationController() | 21 ScreenOrientationController::~ScreenOrientationController() |
22 { | 22 { |
23 } | 23 } |
24 | 24 |
| 25 void ScreenOrientationController::persistentHostHasBeenDestroyed() |
| 26 { |
| 27 // Unregister lifecycle observation once page is being torn down. |
| 28 observeContext(0); |
| 29 } |
| 30 |
25 void ScreenOrientationController::provideTo(LocalFrame& frame, blink::WebScreenO
rientationClient* client) | 31 void ScreenOrientationController::provideTo(LocalFrame& frame, blink::WebScreenO
rientationClient* client) |
26 { | 32 { |
27 ScreenOrientationController* controller = new ScreenOrientationController(fr
ame, client); | 33 ScreenOrientationController* controller = new ScreenOrientationController(fr
ame, client); |
28 WillBeHeapSupplement<LocalFrame>::provideTo(frame, supplementName(), adoptPt
rWillBeNoop(controller)); | 34 WillBeHeapSupplement<LocalFrame>::provideTo(frame, supplementName(), adoptPt
rWillBeNoop(controller)); |
29 } | 35 } |
30 | 36 |
31 ScreenOrientationController& ScreenOrientationController::from(LocalFrame& frame
) | 37 ScreenOrientationController& ScreenOrientationController::from(LocalFrame& frame
) |
32 { | 38 { |
33 return *static_cast<ScreenOrientationController*>(WillBeHeapSupplement<Local
Frame>::from(frame, supplementName())); | 39 return *static_cast<ScreenOrientationController*>(WillBeHeapSupplement<Local
Frame>::from(frame, supplementName())); |
34 } | 40 } |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 if (!m_client) { | 132 if (!m_client) { |
127 // FIXME: temporary until the content layer gets updated. | 133 // FIXME: temporary until the content layer gets updated. |
128 blink::Platform::current()->unlockOrientation(); | 134 blink::Platform::current()->unlockOrientation(); |
129 return; | 135 return; |
130 } | 136 } |
131 | 137 |
132 m_client->unlockOrientation(); | 138 m_client->unlockOrientation(); |
133 } | 139 } |
134 | 140 |
135 } // namespace WebCore | 141 } // namespace WebCore |
OLD | NEW |