| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 Page* ChromeClientImpl::createWindow(Frame* frame, const FrameLoadRequest& r, co
nst WindowFeatures& features, | 216 Page* ChromeClientImpl::createWindow(Frame* frame, const FrameLoadRequest& r, co
nst WindowFeatures& features, |
| 217 NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer) | 217 NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer) |
| 218 { | 218 { |
| 219 if (!m_webView->client()) | 219 if (!m_webView->client()) |
| 220 return 0; | 220 return 0; |
| 221 | 221 |
| 222 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli
cy); | 222 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli
cy); |
| 223 if (policy == WebNavigationPolicyIgnore) | 223 if (policy == WebNavigationPolicyIgnore) |
| 224 policy = getNavigationPolicy(); | 224 policy = getNavigationPolicy(); |
| 225 | 225 |
| 226 DocumentFullscreen::webkitCancelFullScreen(frame->document()); | 226 ASSERT(frame->document()); |
| 227 DocumentFullscreen::webkitCancelFullScreen(*frame->document()); |
| 227 | 228 |
| 228 WebViewImpl* newView = toWebViewImpl( | 229 WebViewImpl* newView = toWebViewImpl( |
| 229 m_webView->client()->createView(WebFrameImpl::fromFrame(frame), WrappedR
esourceRequest(r.resourceRequest()), features, r.frameName(), policy, shouldSend
Referrer == NeverSendReferrer)); | 230 m_webView->client()->createView(WebFrameImpl::fromFrame(frame), WrappedR
esourceRequest(r.resourceRequest()), features, r.frameName(), policy, shouldSend
Referrer == NeverSendReferrer)); |
| 230 if (!newView) | 231 if (!newView) |
| 231 return 0; | 232 return 0; |
| 232 return newView->page(); | 233 return newView->page(); |
| 233 } | 234 } |
| 234 | 235 |
| 235 static inline void updatePolicyForEvent(const WebInputEvent* inputEvent, Navigat
ionPolicy* policy) | 236 static inline void updatePolicyForEvent(const WebInputEvent* inputEvent, Navigat
ionPolicy* policy) |
| 236 { | 237 { |
| (...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 958 { | 959 { |
| 959 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi
ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); | 960 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi
ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); |
| 960 } | 961 } |
| 961 | 962 |
| 962 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc
heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) | 963 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc
heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) |
| 963 { | 964 { |
| 964 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); | 965 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); |
| 965 } | 966 } |
| 966 | 967 |
| 967 } // namespace blink | 968 } // namespace blink |
| OLD | NEW |