| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 #include "core/loader/FrameLoader.h" | 67 #include "core/loader/FrameLoader.h" |
| 68 #include "core/loader/HistoryItem.h" | 68 #include "core/loader/HistoryItem.h" |
| 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_light/DeviceLightController.h" |
| 77 #include "modules/device_orientation/DeviceMotionController.h" | 78 #include "modules/device_orientation/DeviceMotionController.h" |
| 78 #include "modules/device_orientation/DeviceOrientationController.h" | 79 #include "modules/device_orientation/DeviceOrientationController.h" |
| 79 #include "modules/screen_orientation/ScreenOrientationController.h" | 80 #include "modules/screen_orientation/ScreenOrientationController.h" |
| 80 #include "platform/MIMETypeRegistry.h" | 81 #include "platform/MIMETypeRegistry.h" |
| 81 #include "platform/UserGestureIndicator.h" | 82 #include "platform/UserGestureIndicator.h" |
| 82 #include "platform/exported/WrappedResourceRequest.h" | 83 #include "platform/exported/WrappedResourceRequest.h" |
| 83 #include "platform/exported/WrappedResourceResponse.h" | 84 #include "platform/exported/WrappedResourceResponse.h" |
| 84 #include "platform/network/HTTPParsers.h" | 85 #include "platform/network/HTTPParsers.h" |
| 85 #include "platform/network/SocketStreamHandleInternal.h" | 86 #include "platform/network/SocketStreamHandleInternal.h" |
| 86 #include "platform/plugins/PluginData.h" | 87 #include "platform/plugins/PluginData.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 112 { | 113 { |
| 113 } | 114 } |
| 114 | 115 |
| 115 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*
world) | 116 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*
world) |
| 116 { | 117 { |
| 117 if (m_webFrame->client()) { | 118 if (m_webFrame->client()) { |
| 118 m_webFrame->client()->didClearWindowObject(m_webFrame, world->worldId())
; | 119 m_webFrame->client()->didClearWindowObject(m_webFrame, world->worldId())
; |
| 119 Document* document = m_webFrame->frame()->document(); | 120 Document* document = m_webFrame->frame()->document(); |
| 120 if (document) { | 121 if (document) { |
| 121 WheelController::from(*document); | 122 WheelController::from(*document); |
| 123 if (RuntimeEnabledFeatures::deviceLightEnabled()) |
| 124 DeviceLightController::from(*document); |
| 122 if (RuntimeEnabledFeatures::deviceMotionEnabled()) | 125 if (RuntimeEnabledFeatures::deviceMotionEnabled()) |
| 123 DeviceMotionController::from(*document); | 126 DeviceMotionController::from(*document); |
| 124 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 127 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| 125 DeviceOrientationController::from(*document); | 128 DeviceOrientationController::from(*document); |
| 126 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 129 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| 127 ScreenOrientationController::from(*document); | 130 ScreenOrientationController::from(*document); |
| 128 } | 131 } |
| 129 } | 132 } |
| 130 } | 133 } |
| 131 | 134 |
| (...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 805 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame,
client)); | 808 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame,
client)); |
| 806 } | 809 } |
| 807 | 810 |
| 808 void FrameLoaderClientImpl::didStopAllLoaders() | 811 void FrameLoaderClientImpl::didStopAllLoaders() |
| 809 { | 812 { |
| 810 if (m_webFrame->client()) | 813 if (m_webFrame->client()) |
| 811 m_webFrame->client()->didAbortLoading(m_webFrame); | 814 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 812 } | 815 } |
| 813 | 816 |
| 814 } // namespace blink | 817 } // namespace blink |
| OLD | NEW |