| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #include "WebPermissionClient.h" | 47 #include "WebPermissionClient.h" |
| 48 #include "WebPlugin.h" | 48 #include "WebPlugin.h" |
| 49 #include "WebPluginContainerImpl.h" | 49 #include "WebPluginContainerImpl.h" |
| 50 #include "WebPluginLoadObserver.h" | 50 #include "WebPluginLoadObserver.h" |
| 51 #include "WebPluginParams.h" | 51 #include "WebPluginParams.h" |
| 52 #include "WebSecurityOrigin.h" | 52 #include "WebSecurityOrigin.h" |
| 53 #include "WebViewClient.h" | 53 #include "WebViewClient.h" |
| 54 #include "WebViewImpl.h" | 54 #include "WebViewImpl.h" |
| 55 #include "bindings/v8/ScriptController.h" | 55 #include "bindings/v8/ScriptController.h" |
| 56 #include "core/dom/Document.h" | 56 #include "core/dom/Document.h" |
| 57 #include "core/dom/DocumentFullscreen.h" |
| 57 #include "core/events/MessageEvent.h" | 58 #include "core/events/MessageEvent.h" |
| 58 #include "core/events/MouseEvent.h" | 59 #include "core/events/MouseEvent.h" |
| 59 #include "core/dom/WheelController.h" | 60 #include "core/dom/WheelController.h" |
| 60 #include "core/history/HistoryItem.h" | 61 #include "core/history/HistoryItem.h" |
| 61 #include "core/html/HTMLAppletElement.h" | 62 #include "core/html/HTMLAppletElement.h" |
| 62 #include "core/html/HTMLFormElement.h" // needed by core/loader/FormState.h | 63 #include "core/html/HTMLFormElement.h" // needed by core/loader/FormState.h |
| 63 #include "core/loader/DocumentLoader.h" | 64 #include "core/loader/DocumentLoader.h" |
| 64 #include "core/loader/FormState.h" | 65 #include "core/loader/FormState.h" |
| 65 #include "core/loader/FrameLoadRequest.h" | 66 #include "core/loader/FrameLoadRequest.h" |
| 66 #include "core/loader/FrameLoader.h" | 67 #include "core/loader/FrameLoader.h" |
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 { | 481 { |
| 481 // FIXME: why might the webview be null? http://b/1234461 | 482 // FIXME: why might the webview be null? http://b/1234461 |
| 482 WebViewImpl* webview = m_webFrame->viewImpl(); | 483 WebViewImpl* webview = m_webFrame->viewImpl(); |
| 483 if (webview && webview->client()) | 484 if (webview && webview->client()) |
| 484 webview->client()->didStopLoading(); | 485 webview->client()->didStopLoading(); |
| 485 } | 486 } |
| 486 | 487 |
| 487 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na
vigationPolicy policy, const String& suggestedName) | 488 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na
vigationPolicy policy, const String& suggestedName) |
| 488 { | 489 { |
| 489 if (m_webFrame->client()) { | 490 if (m_webFrame->client()) { |
| 491 DocumentFullscreen::webkitCancelFullScreen(m_webFrame->frame()->document
()); |
| 490 WrappedResourceRequest webreq(request); | 492 WrappedResourceRequest webreq(request); |
| 491 m_webFrame->client()->loadURLExternally( | 493 m_webFrame->client()->loadURLExternally( |
| 492 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges
tedName); | 494 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges
tedName); |
| 493 } | 495 } |
| 494 } | 496 } |
| 495 | 497 |
| 496 void FrameLoaderClientImpl::navigateBackForward(int offset) const | 498 void FrameLoaderClientImpl::navigateBackForward(int offset) const |
| 497 { | 499 { |
| 498 WebViewImpl* webview = m_webFrame->viewImpl(); | 500 WebViewImpl* webview = m_webFrame->viewImpl(); |
| 499 if (webview->client()) | 501 if (webview->client()) |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 761 return adoptPtr(m_webFrame->client()->createServiceWorkerProvider(m_webFrame
, client.leakPtr())); | 763 return adoptPtr(m_webFrame->client()->createServiceWorkerProvider(m_webFrame
, client.leakPtr())); |
| 762 } | 764 } |
| 763 | 765 |
| 764 void FrameLoaderClientImpl::didStopAllLoaders() | 766 void FrameLoaderClientImpl::didStopAllLoaders() |
| 765 { | 767 { |
| 766 if (m_webFrame->client()) | 768 if (m_webFrame->client()) |
| 767 m_webFrame->client()->didAbortLoading(m_webFrame); | 769 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 768 } | 770 } |
| 769 | 771 |
| 770 } // namespace WebKit | 772 } // namespace WebKit |
| OLD | NEW |