OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
69 #include "core/loader/ProgressTracker.h" | 69 #include "core/loader/ProgressTracker.h" |
70 #include "core/page/Chrome.h" | 70 #include "core/page/Chrome.h" |
71 #include "core/page/EventHandler.h" | 71 #include "core/page/EventHandler.h" |
72 #include "core/frame/FrameView.h" | 72 #include "core/frame/FrameView.h" |
73 #include "core/page/Page.h" | 73 #include "core/page/Page.h" |
74 #include "core/frame/Settings.h" | 74 #include "core/frame/Settings.h" |
75 #include "core/page/WindowFeatures.h" | 75 #include "core/page/WindowFeatures.h" |
76 #include "core/rendering/HitTestResult.h" | 76 #include "core/rendering/HitTestResult.h" |
77 #include "modules/device_orientation/DeviceMotionController.h" | 77 #include "modules/device_orientation/DeviceMotionController.h" |
78 #include "modules/device_orientation/DeviceOrientationController.h" | 78 #include "modules/device_orientation/DeviceOrientationController.h" |
79 #include "modules/screen_orientation/ScreenOrientationController.h" | |
79 #include "platform/MIMETypeRegistry.h" | 80 #include "platform/MIMETypeRegistry.h" |
80 #include "platform/UserGestureIndicator.h" | 81 #include "platform/UserGestureIndicator.h" |
81 #include "platform/exported/WrappedResourceRequest.h" | 82 #include "platform/exported/WrappedResourceRequest.h" |
82 #include "platform/exported/WrappedResourceResponse.h" | 83 #include "platform/exported/WrappedResourceResponse.h" |
83 #include "platform/network/HTTPParsers.h" | 84 #include "platform/network/HTTPParsers.h" |
84 #include "platform/network/SocketStreamHandleInternal.h" | 85 #include "platform/network/SocketStreamHandleInternal.h" |
85 #include "platform/plugins/PluginData.h" | 86 #include "platform/plugins/PluginData.h" |
86 #include "public/platform/Platform.h" | 87 #include "public/platform/Platform.h" |
87 #include "public/platform/WebMimeRegistry.h" | 88 #include "public/platform/WebMimeRegistry.h" |
88 #include "public/platform/WebRTCPeerConnectionHandler.h" | 89 #include "public/platform/WebRTCPeerConnectionHandler.h" |
(...skipping 25 matching lines...) Expand all Loading... | |
114 { | 115 { |
115 if (m_webFrame->client()) { | 116 if (m_webFrame->client()) { |
116 m_webFrame->client()->didClearWindowObject(m_webFrame, world->worldId()) ; | 117 m_webFrame->client()->didClearWindowObject(m_webFrame, world->worldId()) ; |
117 Document* document = m_webFrame->frame()->document(); | 118 Document* document = m_webFrame->frame()->document(); |
118 if (document) { | 119 if (document) { |
119 WheelController::from(document); | 120 WheelController::from(document); |
120 if (RuntimeEnabledFeatures::deviceMotionEnabled()) | 121 if (RuntimeEnabledFeatures::deviceMotionEnabled()) |
121 DeviceMotionController::from(document); | 122 DeviceMotionController::from(document); |
122 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 123 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
123 DeviceOrientationController::from(document); | 124 DeviceOrientationController::from(document); |
125 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | |
126 ScreenOrientationController::from(document); | |
abarth-chromium
2014/02/19 18:51:49
Is this necessary? This means we'll always boot u
Inactive
2014/02/19 19:04:51
Yes, I need to make sure we construct the ScreenOr
| |
124 } | 127 } |
125 } | 128 } |
126 } | 129 } |
127 | 130 |
128 void FrameLoaderClientImpl::documentElementAvailable() | 131 void FrameLoaderClientImpl::documentElementAvailable() |
129 { | 132 { |
130 if (m_webFrame->client()) | 133 if (m_webFrame->client()) |
131 m_webFrame->client()->didCreateDocumentElement(m_webFrame); | 134 m_webFrame->client()->didCreateDocumentElement(m_webFrame); |
132 } | 135 } |
133 | 136 |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
781 return m_webFrame->sharedWorkerRepositoryClient(); | 784 return m_webFrame->sharedWorkerRepositoryClient(); |
782 } | 785 } |
783 | 786 |
784 void FrameLoaderClientImpl::didStopAllLoaders() | 787 void FrameLoaderClientImpl::didStopAllLoaders() |
785 { | 788 { |
786 if (m_webFrame->client()) | 789 if (m_webFrame->client()) |
787 m_webFrame->client()->didAbortLoading(m_webFrame); | 790 m_webFrame->client()->didAbortLoading(m_webFrame); |
788 } | 791 } |
789 | 792 |
790 } // namespace blink | 793 } // namespace blink |
OLD | NEW |