| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 106 |
| 107 FrameLoaderClientImpl::FrameLoaderClientImpl(WebLocalFrameImpl* frame) | 107 FrameLoaderClientImpl::FrameLoaderClientImpl(WebLocalFrameImpl* frame) |
| 108 : m_webFrame(frame) | 108 : m_webFrame(frame) |
| 109 { | 109 { |
| 110 } | 110 } |
| 111 | 111 |
| 112 FrameLoaderClientImpl::~FrameLoaderClientImpl() | 112 FrameLoaderClientImpl::~FrameLoaderClientImpl() |
| 113 { | 113 { |
| 114 } | 114 } |
| 115 | 115 |
| 116 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&
world) | 116 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInMainWorld() |
| 117 { | 117 { |
| 118 if (m_webFrame->client()) { | 118 if (m_webFrame->client()) { |
| 119 m_webFrame->client()->didClearWindowObject(m_webFrame, world.worldId()); | 119 m_webFrame->client()->didClearWindowObject(m_webFrame); |
| 120 Document* document = m_webFrame->frame()->document(); | 120 Document* document = m_webFrame->frame()->document(); |
| 121 if (document) { | 121 if (document) { |
| 122 WheelController::from(*document); | 122 WheelController::from(*document); |
| 123 if (RuntimeEnabledFeatures::deviceMotionEnabled()) | 123 if (RuntimeEnabledFeatures::deviceMotionEnabled()) |
| 124 DeviceMotionController::from(*document); | 124 DeviceMotionController::from(*document); |
| 125 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 125 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| 126 DeviceOrientationController::from(*document); | 126 DeviceOrientationController::from(*document); |
| 127 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 127 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| 128 ScreenOrientationController::from(*document); | 128 ScreenOrientationController::from(*document); |
| 129 if (RuntimeEnabledFeatures::gamepadEnabled()) | 129 if (RuntimeEnabledFeatures::gamepadEnabled()) |
| (...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame,
client)); | 803 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame,
client)); |
| 804 } | 804 } |
| 805 | 805 |
| 806 void FrameLoaderClientImpl::didStopAllLoaders() | 806 void FrameLoaderClientImpl::didStopAllLoaders() |
| 807 { | 807 { |
| 808 if (m_webFrame->client()) | 808 if (m_webFrame->client()) |
| 809 m_webFrame->client()->didAbortLoading(m_webFrame); | 809 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 810 } | 810 } |
| 811 | 811 |
| 812 } // namespace blink | 812 } // namespace blink |
| OLD | NEW |