Chromium Code Reviews| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 #include "WebPluginContainerImpl.h" | 51 #include "WebPluginContainerImpl.h" |
| 52 #include "WebPluginLoadObserver.h" | 52 #include "WebPluginLoadObserver.h" |
| 53 #include "WebPluginParams.h" | 53 #include "WebPluginParams.h" |
| 54 #include "WebSecurityOrigin.h" | 54 #include "WebSecurityOrigin.h" |
| 55 #include "WebViewClient.h" | 55 #include "WebViewClient.h" |
| 56 #include "WebViewImpl.h" | 56 #include "WebViewImpl.h" |
| 57 #include "bindings/v8/Dictionary.h" | 57 #include "bindings/v8/Dictionary.h" |
| 58 #include "bindings/v8/ScriptController.h" | 58 #include "bindings/v8/ScriptController.h" |
| 59 #include "core/dom/Document.h" | 59 #include "core/dom/Document.h" |
| 60 #include "core/dom/DocumentFullscreen.h" | 60 #include "core/dom/DocumentFullscreen.h" |
| 61 #include "core/dom/EventHandlerRegistry.h" | |
| 61 #include "core/events/MessageEvent.h" | 62 #include "core/events/MessageEvent.h" |
| 62 #include "core/events/MouseEvent.h" | 63 #include "core/events/MouseEvent.h" |
| 63 #include "core/dom/WheelController.h" | 64 #include "core/dom/WheelController.h" |
| 64 #include "core/html/HTMLAppletElement.h" | 65 #include "core/html/HTMLAppletElement.h" |
| 65 #include "core/loader/DocumentLoader.h" | 66 #include "core/loader/DocumentLoader.h" |
| 66 #include "core/loader/FrameLoadRequest.h" | 67 #include "core/loader/FrameLoadRequest.h" |
| 67 #include "core/loader/FrameLoader.h" | 68 #include "core/loader/FrameLoader.h" |
| 68 #include "core/loader/HistoryItem.h" | 69 #include "core/loader/HistoryItem.h" |
| 69 #include "core/page/Chrome.h" | 70 #include "core/page/Chrome.h" |
| 70 #include "core/page/EventHandler.h" | 71 #include "core/page/EventHandler.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after 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 EventHandlerRegistry::from(*document); | |
|
abarth-chromium
2014/04/17 18:05:12
I don't think this is needed. Does your test fail
Sami
2014/04/17 18:40:53
The test passes fine without this. I only added it
| |
| 122 if (RuntimeEnabledFeatures::deviceMotionEnabled()) | 124 if (RuntimeEnabledFeatures::deviceMotionEnabled()) |
| 123 DeviceMotionController::from(*document); | 125 DeviceMotionController::from(*document); |
| 124 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 126 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| 125 DeviceOrientationController::from(*document); | 127 DeviceOrientationController::from(*document); |
| 126 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 128 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| 127 ScreenOrientationController::from(*document); | 129 ScreenOrientationController::from(*document); |
| 128 if (RuntimeEnabledFeatures::gamepadEnabled()) | 130 if (RuntimeEnabledFeatures::gamepadEnabled()) |
| 129 NavigatorGamepad::from(*document); | 131 NavigatorGamepad::from(*document); |
| 130 } | 132 } |
| 131 } | 133 } |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 800 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame, client)); | 802 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame, client)); |
| 801 } | 803 } |
| 802 | 804 |
| 803 void FrameLoaderClientImpl::didStopAllLoaders() | 805 void FrameLoaderClientImpl::didStopAllLoaders() |
| 804 { | 806 { |
| 805 if (m_webFrame->client()) | 807 if (m_webFrame->client()) |
| 806 m_webFrame->client()->didAbortLoading(m_webFrame); | 808 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 807 } | 809 } |
| 808 | 810 |
| 809 } // namespace blink | 811 } // namespace blink |
| OLD | NEW |