Changeset 163129 in webkit


Ignore:
Timestamp:
Jan 30, 2014 3:24:12 PM (10 years ago)
Author:
andersca@apple.com
Message:

Implement NavigationState::PolicyClient::decidePolicyForNewWindowAction
https://bugs.webkit.org/show_bug.cgi?id=127962

Reviewed by Andreas Kling.

Have decidePolicyForNewWindowAction call decidePolicyForNavigationAction with a null destination frame.

  • UIProcess/Cocoa/NavigationState.h:
  • UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
(WebKit::NavigationState::PolicyClient::decidePolicyForNewWindowAction):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r163125 r163129  
     12014-01-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Implement NavigationState::PolicyClient::decidePolicyForNewWindowAction
     4        https://bugs.webkit.org/show_bug.cgi?id=127962
     5
     6        Reviewed by Andreas Kling.
     7
     8        Have decidePolicyForNewWindowAction call decidePolicyForNavigationAction with a null destination frame.
     9
     10        * UIProcess/Cocoa/NavigationState.h:
     11        * UIProcess/Cocoa/NavigationState.mm:
     12        (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
     13        (WebKit::NavigationState::PolicyClient::decidePolicyForNewWindowAction):
     14
    1152014-01-30  Martin Hock  <mhock@apple.com>
    216
  • trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h

    r163112 r163129  
    6262    private:
    6363        // API::PolicyClient
    64         virtual void decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, const NavigationActionData&, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebFramePolicyListenerProxy>, API::Object* userData) override;
     64        virtual void decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy* destinationFrame, const NavigationActionData&, WebFrameProxy* sourceFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebFramePolicyListenerProxy>, API::Object* userData) override;
     65        virtual void decidePolicyForNewWindowAction(WebPageProxy*, WebFrameProxy* sourceFrame, const NavigationActionData&, const WebCore::ResourceRequest&, const WTF::String& frameName, RefPtr<WebFramePolicyListenerProxy>, API::Object* userData) override;
    6566        virtual void decidePolicyForResponse(WebPageProxy*, WebFrameProxy*, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, RefPtr<WebFramePolicyListenerProxy>, API::Object* userData) override;
    6667
  • trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

    r163112 r163129  
    8383}
    8484
    85 void NavigationState::PolicyClient::decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, const NavigationActionData&, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* userData)
     85void NavigationState::PolicyClient::decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy* destinationFrame, const NavigationActionData&, WebFrameProxy* sourceFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* userData)
    8686{
    8787    if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler) {
     
    113113        }
    114114    }];
     115}
     116
     117void NavigationState::PolicyClient::decidePolicyForNewWindowAction(WebPageProxy* webPageProxy, WebFrameProxy* sourceFrame, const NavigationActionData& navigationActionData, const WebCore::ResourceRequest& request, const WTF::String& frameName, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* userData)
     118{
     119    decidePolicyForNavigationAction(webPageProxy, nullptr, navigationActionData, sourceFrame, request, request, std::move(listener), userData);
    115120}
    116121
Note: See TracChangeset for help on using the changeset viewer.