Changeset 177795 in webkit


Ignore:
Timestamp:
Dec 29, 2014 10:38:07 AM (9 years ago)
Author:
andersca@apple.com
Message:

Convert all variadic WebProcessProxy message over to UserData
​https://bugs.webkit.org/show_bug.cgi?id=139990

Reviewed by Sam Weinig.

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::willGoToBackForwardListItem):
(WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
(WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame):
(WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
(WebKit::WebPageProxy::didFinishLoadForFrame):
(WebKit::WebPageProxy::didFailLoadForFrame):
(WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
(WebKit::WebPageProxy::didReceiveTitleForFrame):
(WebKit::WebPageProxy::didFirstLayoutForFrame):
(WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame):
(WebKit::WebPageProxy::didLayout):
(WebKit::WebPageProxy::didRemoveFrameFromHierarchy):
(WebKit::WebPageProxy::didDisplayInsecureContentForFrame):
(WebKit::WebPageProxy::didRunInsecureContentForFrame):
(WebKit::WebPageProxy::didDetectXSSForFrame):
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
(WebKit::WebPageProxy::decidePolicyForNewWindowAction):
(WebKit::WebPageProxy::decidePolicyForResponse):
(WebKit::WebPageProxy::decidePolicyForResponseSync):
(WebKit::WebPageProxy::unableToImplementPolicy):
(WebKit::WebPageProxy::willSubmitForm):
(WebKit::WebPageProxy::mouseDidMoveOverElement):
(WebKit::WebPageProxy::didBeginTrackingPotentialLongMousePress):
(WebKit::WebPageProxy::didRecognizeLongMousePress):
(WebKit::WebPageProxy::didCancelTrackingPotentialLongMousePress):
(WebKit::WebPageProxy::showContextMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::didPerformActionMenuHitTest):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::showSelectionServiceMenu):

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::mouseDidMoveOverElement):
(WebKit::WebChromeClient::didBeginTrackingPotentialLongMousePress):
(WebKit::WebChromeClient::didRecognizeLongMousePress):
(WebKit::WebChromeClient::didCancelTrackingPotentialLongMousePress):

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::detachedFromParent2):
(WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
(WebKit::WebFrameLoaderClient::dispatchDidChangeLocationWithinPage):
(WebKit::WebFrameLoaderClient::dispatchDidPushStateWithinPage):
(WebKit::WebFrameLoaderClient::dispatchDidReplaceStateWithinPage):
(WebKit::WebFrameLoaderClient::dispatchDidPopStateWithinPage):
(WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
(WebKit::WebFrameLoaderClient::dispatchDidReceiveTitle):
(WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFailLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFinishLoad):
(WebKit::WebFrameLoaderClient::dispatchDidLayout):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
(WebKit::WebFrameLoaderClient::dispatchUnableToImplementPolicy):
(WebKit::WebFrameLoaderClient::dispatchWillSubmitForm):
(WebKit::WebFrameLoaderClient::shouldGoToHistoryItem):
(WebKit::WebFrameLoaderClient::didDisplayInsecureContent):
(WebKit::WebFrameLoaderClient::didRunInsecureContent):
(WebKit::WebFrameLoaderClient::didDetectXSS):

  • WebProcess/WebPage/WebContextMenu.cpp:

(WebKit::WebContextMenu::show):

  • WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::performActionMenuHitTestAtLocation):

Location:
trunk/Source/WebKit2
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r177794 r177795  
     12014-12-29  Anders Carlsson  <andersca@apple.com>
     2
     3        Convert all variadic WebProcessProxy message over to UserData
     4        https://bugs.webkit.org/show_bug.cgi?id=139990
     5
     6        Reviewed by Sam Weinig.
     7
     8        * UIProcess/WebPageProxy.cpp:
     9        (WebKit::WebPageProxy::willGoToBackForwardListItem):
     10        (WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
     11        (WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame):
     12        (WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
     13        (WebKit::WebPageProxy::didCommitLoadForFrame):
     14        (WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
     15        (WebKit::WebPageProxy::didFinishLoadForFrame):
     16        (WebKit::WebPageProxy::didFailLoadForFrame):
     17        (WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
     18        (WebKit::WebPageProxy::didReceiveTitleForFrame):
     19        (WebKit::WebPageProxy::didFirstLayoutForFrame):
     20        (WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame):
     21        (WebKit::WebPageProxy::didLayout):
     22        (WebKit::WebPageProxy::didRemoveFrameFromHierarchy):
     23        (WebKit::WebPageProxy::didDisplayInsecureContentForFrame):
     24        (WebKit::WebPageProxy::didRunInsecureContentForFrame):
     25        (WebKit::WebPageProxy::didDetectXSSForFrame):
     26        (WebKit::WebPageProxy::decidePolicyForNavigationAction):
     27        (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
     28        (WebKit::WebPageProxy::decidePolicyForResponse):
     29        (WebKit::WebPageProxy::decidePolicyForResponseSync):
     30        (WebKit::WebPageProxy::unableToImplementPolicy):
     31        (WebKit::WebPageProxy::willSubmitForm):
     32        (WebKit::WebPageProxy::mouseDidMoveOverElement):
     33        (WebKit::WebPageProxy::didBeginTrackingPotentialLongMousePress):
     34        (WebKit::WebPageProxy::didRecognizeLongMousePress):
     35        (WebKit::WebPageProxy::didCancelTrackingPotentialLongMousePress):
     36        (WebKit::WebPageProxy::showContextMenu):
     37        (WebKit::WebPageProxy::internalShowContextMenu):
     38        (WebKit::WebPageProxy::didPerformActionMenuHitTest):
     39        * UIProcess/WebPageProxy.h:
     40        * UIProcess/WebPageProxy.messages.in:
     41        * UIProcess/mac/WebPageProxyMac.mm:
     42        (WebKit::WebPageProxy::showSelectionServiceMenu):
     43        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     44        (WebKit::WebChromeClient::mouseDidMoveOverElement):
     45        (WebKit::WebChromeClient::didBeginTrackingPotentialLongMousePress):
     46        (WebKit::WebChromeClient::didRecognizeLongMousePress):
     47        (WebKit::WebChromeClient::didCancelTrackingPotentialLongMousePress):
     48        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     49        (WebKit::WebFrameLoaderClient::detachedFromParent2):
     50        (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
     51        (WebKit::WebFrameLoaderClient::dispatchDidChangeLocationWithinPage):
     52        (WebKit::WebFrameLoaderClient::dispatchDidPushStateWithinPage):
     53        (WebKit::WebFrameLoaderClient::dispatchDidReplaceStateWithinPage):
     54        (WebKit::WebFrameLoaderClient::dispatchDidPopStateWithinPage):
     55        (WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
     56        (WebKit::WebFrameLoaderClient::dispatchDidReceiveTitle):
     57        (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
     58        (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
     59        (WebKit::WebFrameLoaderClient::dispatchDidFailLoad):
     60        (WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
     61        (WebKit::WebFrameLoaderClient::dispatchDidFinishLoad):
     62        (WebKit::WebFrameLoaderClient::dispatchDidLayout):
     63        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
     64        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
     65        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
     66        (WebKit::WebFrameLoaderClient::dispatchUnableToImplementPolicy):
     67        (WebKit::WebFrameLoaderClient::dispatchWillSubmitForm):
     68        (WebKit::WebFrameLoaderClient::shouldGoToHistoryItem):
     69        (WebKit::WebFrameLoaderClient::didDisplayInsecureContent):
     70        (WebKit::WebFrameLoaderClient::didRunInsecureContent):
     71        (WebKit::WebFrameLoaderClient::didDetectXSS):
     72        * WebProcess/WebPage/WebContextMenu.cpp:
     73        (WebKit::WebContextMenu::show):
     74        * WebProcess/WebPage/mac/WebPageMac.mm:
     75        (WebKit::WebPage::performActionMenuHitTestAtLocation):
     76
    1772014-12-29  Sam Weinig  <sam@webkit.org>
    278

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r177708 r177795  
    10171017}
    10181018
    1019 void WebPageProxy::willGoToBackForwardListItem(uint64_t itemID, IPC::MessageDecoder& decoder)
    1020 {
    1021     RefPtr<API::Object> userData;
    1022     WebContextUserMessageDecoder messageDecoder(userData, process());
    1023     if (!decoder.decode(messageDecoder))
    1024         return;
    1025 
     1019void WebPageProxy::willGoToBackForwardListItem(uint64_t itemID, const UserData& userData)
     1020{
    10261021    if (WebBackForwardListItem* item = m_process->webBackForwardItem(itemID))
    1027         m_loaderClient->willGoToBackForwardListItem(this, item, userData.get());
     1022        m_loaderClient->willGoToBackForwardListItem(this, item, m_process->transformHandlesToObjects(userData.object()).get());
    10281023}
    10291024
    … …  
    25752570}
    25762571
    2577 void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, IPC::MessageDecoder& decoder)
     2572void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, const UserData& userData)
    25782573{
    25792574    auto transaction = m_pageLoadState.transaction();
    25802575
    25812576    m_pageLoadState.clearPendingAPIRequestURL(transaction);
    2582 
    2583     RefPtr<API::Object> userData;
    2584     WebContextUserMessageDecoder messageDecoder(userData, process());
    2585     if (!decoder.decode(messageDecoder))
    2586         return;
    25872577
    25882578    WebFrameProxy* frame = m_process->webFrame(frameID);
    … …  
    25972587
    25982588    m_pageLoadState.commitChanges();
    2599     m_loaderClient->didStartProvisionalLoadForFrame(this, frame, navigationID, userData.get());
    2600 }
    2601 
    2602 void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, IPC::MessageDecoder& decoder)
    2603 {
    2604     RefPtr<API::Object> userData;
    2605     WebContextUserMessageDecoder messageDecoder(userData, process());
    2606     if (!decoder.decode(messageDecoder))
    2607         return;
    2608 
     2589    m_loaderClient->didStartProvisionalLoadForFrame(this, frame, navigationID, m_process->transformHandlesToObjects(userData.object()).get());
     2590}
     2591
     2592void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const UserData& userData)
     2593{
    26092594    WebFrameProxy* frame = m_process->webFrame(frameID);
    26102595    MESSAGE_CHECK(frame);
    … …  
    26192604
    26202605    m_pageLoadState.commitChanges();
    2621     m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, navigationID, userData.get());
    2622 }
    2623 
    2624 void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const ResourceError& error, IPC::MessageDecoder& decoder)
    2625 {
    2626     RefPtr<API::Object> userData;
    2627     WebContextUserMessageDecoder messageDecoder(userData, process());
    2628     if (!decoder.decode(messageDecoder))
    2629         return;
    2630 
     2606    m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, navigationID, m_process->transformHandlesToObjects(userData.object()).get());
     2607}
     2608
     2609void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const ResourceError& error, const UserData& userData)
     2610{
    26312611    WebFrameProxy* frame = m_process->webFrame(frameID);
    26322612    MESSAGE_CHECK(frame);
    … …  
    26402620
    26412621    m_pageLoadState.commitChanges();
    2642     m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, navigationID, error, userData.get());
     2622    m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, navigationID, error, m_process->transformHandlesToObjects(userData.object()).get());
    26432623}
    26442624
    … …  
    26562636}
    26572637
    2658 void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, IPC::MessageDecoder& decoder)
    2659 {
    2660     RefPtr<API::Object> userData;
    2661     WebContextUserMessageDecoder messageDecoder(userData, process());
    2662     if (!decoder.decode(messageDecoder))
    2663         return;
    2664 
     2638void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, const UserData& userData)
     2639{
    26652640    WebFrameProxy* frame = m_process->webFrame(frameID);
    26662641    MESSAGE_CHECK(frame);
    … …  
    27132688
    27142689    m_pageLoadState.commitChanges();
    2715     m_loaderClient->didCommitLoadForFrame(this, frame, navigationID, userData.get());
    2716 }
    2717 
    2718 void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, IPC::MessageDecoder& decoder)
    2719 {
    2720     RefPtr<API::Object> userData;
    2721     WebContextUserMessageDecoder messageDecoder(userData, process());
    2722     if (!decoder.decode(messageDecoder))
    2723         return;
    2724 
     2690    m_loaderClient->didCommitLoadForFrame(this, frame, navigationID, m_process->transformHandlesToObjects(userData.object()).get());
     2691}
     2692
     2693void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData& userData)
     2694{
    27252695    WebFrameProxy* frame = m_process->webFrame(frameID);
    27262696    MESSAGE_CHECK(frame);
    27272697
    2728     m_loaderClient->didFinishDocumentLoadForFrame(this, frame, navigationID, userData.get());
    2729 }
    2730 
    2731 void WebPageProxy::didFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, IPC::MessageDecoder& decoder)
    2732 {
    2733     RefPtr<API::Object> userData;
    2734     WebContextUserMessageDecoder messageDecoder(userData, process());
    2735     if (!decoder.decode(messageDecoder))
    2736         return;
    2737 
     2698    m_loaderClient->didFinishDocumentLoadForFrame(this, frame, navigationID, m_process->transformHandlesToObjects(userData.object()).get());
     2699}
     2700
     2701void WebPageProxy::didFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData& userData)
     2702{
    27382703    WebFrameProxy* frame = m_process->webFrame(frameID);
    27392704    MESSAGE_CHECK(frame);
    … …  
    27482713
    27492714    m_pageLoadState.commitChanges();
    2750     m_loaderClient->didFinishLoadForFrame(this, frame, navigationID, userData.get());
     2715    m_loaderClient->didFinishLoadForFrame(this, frame, navigationID, m_process->transformHandlesToObjects(userData.object()).get());
    27512716
    27522717    if (isMainFrame)
    … …  
    27542719}
    27552720
    2756 void WebPageProxy::didFailLoadForFrame(uint64_t frameID, uint64_t navigationID, const ResourceError& error, IPC::MessageDecoder& decoder)
    2757 {
    2758     RefPtr<API::Object> userData;
    2759     WebContextUserMessageDecoder messageDecoder(userData, process());
    2760     if (!decoder.decode(messageDecoder))
    2761         return;
    2762 
     2721void WebPageProxy::didFailLoadForFrame(uint64_t frameID, uint64_t navigationID, const ResourceError& error, const UserData& userData)
     2722{
    27632723    WebFrameProxy* frame = m_process->webFrame(frameID);
    27642724    MESSAGE_CHECK(frame);
    … …  
    27742734
    27752735    m_pageLoadState.commitChanges();
    2776     m_loaderClient->didFailLoadWithErrorForFrame(this, frame, navigationID, error, userData.get());
    2777 }
    2778 
    2779 void WebPageProxy::didSameDocumentNavigationForFrame(uint64_t frameID, uint64_t navigationID, uint32_t opaqueSameDocumentNavigationType, const String& url, IPC::MessageDecoder& decoder)
    2780 {
    2781     RefPtr<API::Object> userData;
    2782     WebContextUserMessageDecoder messageDecoder(userData, process());
    2783     if (!decoder.decode(messageDecoder))
    2784         return;
    2785 
     2736    m_loaderClient->didFailLoadWithErrorForFrame(this, frame, navigationID, error, m_process->transformHandlesToObjects(userData.object()).get());
     2737}
     2738
     2739void WebPageProxy::didSameDocumentNavigationForFrame(uint64_t frameID, uint64_t navigationID, uint32_t opaqueSameDocumentNavigationType, const String& url, const UserData& userData)
     2740{
    27862741    WebFrameProxy* frame = m_process->webFrame(frameID);
    27872742    MESSAGE_CHECK(frame);
    … …  
    28002755
    28012756    SameDocumentNavigationType navigationType = static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType);
    2802     m_loaderClient->didSameDocumentNavigationForFrame(this, frame, navigationID, navigationType, userData.get());
     2757    m_loaderClient->didSameDocumentNavigationForFrame(this, frame, navigationID, navigationType, m_process->transformHandlesToObjects(userData.object()).get());
    28032758
    28042759    if (isMainFrame)
    … …  
    28062761}
    28072762
    2808 void WebPageProxy::didReceiveTitleForFrame(uint64_t frameID, const String& title, IPC::MessageDecoder& decoder)
    2809 {
    2810     RefPtr<API::Object> userData;
    2811     WebContextUserMessageDecoder messageDecoder(userData, process());
    2812     if (!decoder.decode(messageDecoder))
    2813         return;
    2814 
     2763void WebPageProxy::didReceiveTitleForFrame(uint64_t frameID, const String& title, const UserData& userData)
     2764{
    28152765    WebFrameProxy* frame = m_process->webFrame(frameID);
    28162766    MESSAGE_CHECK(frame);
    … …  
    28242774   
    28252775    m_pageLoadState.commitChanges();
    2826     m_loaderClient->didReceiveTitleForFrame(this, title, frame, userData.get());
    2827 }
    2828 
    2829 void WebPageProxy::didFirstLayoutForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
    2830 {
    2831     RefPtr<API::Object> userData;
    2832     WebContextUserMessageDecoder messageDecoder(userData, process());
    2833     if (!decoder.decode(messageDecoder))
    2834         return;
    2835 
     2776    m_loaderClient->didReceiveTitleForFrame(this, title, frame, m_process->transformHandlesToObjects(userData.object()).get());
     2777}
     2778
     2779void WebPageProxy::didFirstLayoutForFrame(uint64_t frameID, const UserData& userData)
     2780{
    28362781    WebFrameProxy* frame = m_process->webFrame(frameID);
    28372782    MESSAGE_CHECK(frame);
    28382783
    2839     m_loaderClient->didFirstLayoutForFrame(this, frame, userData.get());
    2840 }
    2841 
    2842 void WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
    2843 {
    2844     RefPtr<API::Object> userData;
    2845     WebContextUserMessageDecoder messageDecoder(userData, process());
    2846     if (!decoder.decode(messageDecoder))
    2847         return;
    2848 
     2784    m_loaderClient->didFirstLayoutForFrame(this, frame, m_process->transformHandlesToObjects(userData.object()).get());
     2785}
     2786
     2787void WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, const UserData& userData)
     2788{
    28492789    WebFrameProxy* frame = m_process->webFrame(frameID);
    28502790    MESSAGE_CHECK(frame);
    28512791
    2852     m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get());
     2792    m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, m_process->transformHandlesToObjects(userData.object()).get());
    28532793
    28542794    if (frame->isMainFrame())
    … …  
    28562796}
    28572797
    2858 void WebPageProxy::didLayout(uint32_t layoutMilestones, IPC::MessageDecoder& decoder)
    2859 {
    2860     RefPtr<API::Object> userData;
    2861     WebContextUserMessageDecoder messageDecoder(userData, process());
    2862     if (!decoder.decode(messageDecoder))
    2863         return;
    2864 
    2865     m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get());
    2866 }
    2867 
    2868 void WebPageProxy::didRemoveFrameFromHierarchy(uint64_t frameID, IPC::MessageDecoder& decoder)
    2869 {
    2870     RefPtr<API::Object> userData;
    2871     WebContextUserMessageDecoder messageDecoder(userData, process());
    2872     if (!decoder.decode(messageDecoder))
    2873         return;
    2874 
     2798void WebPageProxy::didLayout(uint32_t layoutMilestones, const UserData& userData)
     2799{
     2800    m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), m_process->transformHandlesToObjects(userData.object()).get());
     2801}
     2802
     2803void WebPageProxy::didRemoveFrameFromHierarchy(uint64_t frameID, const UserData& userData)
     2804{
    28752805    WebFrameProxy* frame = m_process->webFrame(frameID);
    28762806    MESSAGE_CHECK(frame);
    28772807
    2878     m_loaderClient->didRemoveFrameFromHierarchy(this, frame, userData.get());
    2879 }
    2880 
    2881 void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
    2882 {
    2883     RefPtr<API::Object> userData;
    2884     WebContextUserMessageDecoder messageDecoder(userData, process());
    2885     if (!decoder.decode(messageDecoder))
    2886         return;
    2887 
     2808    m_loaderClient->didRemoveFrameFromHierarchy(this, frame, m_process->transformHandlesToObjects(userData.object()).get());
     2809}
     2810
     2811void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, const UserData& userData)
     2812{
    28882813    WebFrameProxy* frame = m_process->webFrame(frameID);
    28892814    MESSAGE_CHECK(frame);
    … …  
    28932818
    28942819    m_pageLoadState.commitChanges();
    2895     m_loaderClient->didDisplayInsecureContentForFrame(this, frame, userData.get());
    2896 }
    2897 
    2898 void WebPageProxy::didRunInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
    2899 {
    2900     RefPtr<API::Object> userData;
    2901     WebContextUserMessageDecoder messageDecoder(userData, process());
    2902     if (!decoder.decode(messageDecoder))
    2903         return;
    2904 
     2820    m_loaderClient->didDisplayInsecureContentForFrame(this, frame, m_process->transformHandlesToObjects(userData.object()).get());
     2821}
     2822
     2823void WebPageProxy::didRunInsecureContentForFrame(uint64_t frameID, const UserData& userData)
     2824{
    29052825    WebFrameProxy* frame = m_process->webFrame(frameID);
    29062826    MESSAGE_CHECK(frame);
    … …  
    29102830
    29112831    m_pageLoadState.commitChanges();
    2912     m_loaderClient->didRunInsecureContentForFrame(this, frame, userData.get());
    2913 }
    2914 
    2915 void WebPageProxy::didDetectXSSForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
    2916 {
    2917     RefPtr<API::Object> userData;
    2918     WebContextUserMessageDecoder messageDecoder(userData, process());
    2919     if (!decoder.decode(messageDecoder))
    2920         return;
    2921 
     2832    m_loaderClient->didRunInsecureContentForFrame(this, frame, m_process->transformHandlesToObjects(userData.object()).get());
     2833}
     2834
     2835void WebPageProxy::didDetectXSSForFrame(uint64_t frameID, const UserData& userData)
     2836{
    29222837    WebFrameProxy* frame = m_process->webFrame(frameID);
    29232838    MESSAGE_CHECK(frame);
    29242839
    2925     m_loaderClient->didDetectXSSForFrame(this, frame, userData.get());
     2840    m_loaderClient->didDetectXSSForFrame(this, frame, m_process->transformHandlesToObjects(userData.object()).get());
    29262841}
    29272842
    … …  
    29362851}
    29372852
    2938 void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, const NavigationActionData& navigationActionData, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, IPC::MessageDecoder& decoder, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID)
    2939 {
    2940     RefPtr<API::Object> userData;
    2941     WebContextUserMessageDecoder messageDecoder(userData, process());
    2942     if (!decoder.decode(messageDecoder))
    2943         return;
    2944 
     2853void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, const NavigationActionData& navigationActionData, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID)
     2854{
    29452855    auto transaction = m_pageLoadState.transaction();
    29462856
    … …  
    29742884    m_syncNavigationActionPolicyActionIsValid = false;
    29752885
    2976     m_policyClient->decidePolicyForNavigationAction(this, frame, navigationActionData, originatingFrame, originalRequest, request, WTF::move(listener), userData.get());
     2886    m_policyClient->decidePolicyForNavigationAction(this, frame, navigationActionData, originatingFrame, originalRequest, request, WTF::move(listener), m_process->transformHandlesToObjects(userData.object()).get());
    29772887
    29782888    m_inDecidePolicyForNavigationAction = false;
    … …  
    29862896}
    29872897
    2988 void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, const NavigationActionData& navigationActionData, const ResourceRequest& request, const String& frameName, uint64_t listenerID, IPC::MessageDecoder& decoder)
    2989 {
    2990     RefPtr<API::Object> userData;
    2991     WebContextUserMessageDecoder messageDecoder(userData, process());
    2992     if (!decoder.decode(messageDecoder))
    2993         return;
    2994 
     2898void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, const NavigationActionData& navigationActionData, const ResourceRequest& request, const String& frameName, uint64_t listenerID, const UserData& userData)
     2899{
    29952900    WebFrameProxy* frame = m_process->webFrame(frameID);
    29962901    MESSAGE_CHECK(frame);
    … …  
    29992904    RefPtr<WebFramePolicyListenerProxy> listener = frame->setUpPolicyListenerProxy(listenerID);
    30002905
    3001     m_policyClient->decidePolicyForNewWindowAction(this, frame, navigationActionData, request, frameName, WTF::move(listener), userData.get());
    3002 }
    3003 
    3004 void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder& decoder)
    3005 {
    3006     RefPtr<API::Object> userData;
    3007     WebContextUserMessageDecoder messageDecoder(userData, process());
    3008     if (!decoder.decode(messageDecoder))
    3009         return;
    3010 
     2906    m_policyClient->decidePolicyForNewWindowAction(this, frame, navigationActionData, request, frameName, WTF::move(listener), m_process->transformHandlesToObjects(userData.object()).get());
     2907}
     2908
     2909void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData)
     2910{
    30112911    WebFrameProxy* frame = m_process->webFrame(frameID);
    30122912    MESSAGE_CHECK(frame);
    … …  
    30162916    RefPtr<WebFramePolicyListenerProxy> listener = frame->setUpPolicyListenerProxy(listenerID);
    30172917
    3018     m_policyClient->decidePolicyForResponse(this, frame, response, request, canShowMIMEType, WTF::move(listener), userData.get());
    3019 }
    3020 
    3021 void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder& decoder, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
     2918    m_policyClient->decidePolicyForResponse(this, frame, response, request, canShowMIMEType, WTF::move(listener), m_process->transformHandlesToObjects(userData.object()).get());
     2919}
     2920
     2921void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
    30222922{
    30232923    ASSERT(!m_inDecidePolicyForResponseSync);
    … …  
    30272927    m_syncMimeTypePolicyActionIsValid = false;
    30282928
    3029     decidePolicyForResponse(frameID, response, request, canShowMIMEType, listenerID, decoder);
     2929    decidePolicyForResponse(frameID, response, request, canShowMIMEType, listenerID, userData);
    30302930
    30312931    m_inDecidePolicyForResponseSync = false;
    … …  
    30402940}
    30412941
    3042 void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError& error, IPC::MessageDecoder& decoder)
    3043 {
    3044     RefPtr<API::Object> userData;
    3045     WebContextUserMessageDecoder messageDecoder(userData, process());
    3046     if (!decoder.decode(messageDecoder))
    3047         return;
    3048    
     2942void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError& error, const UserData& userData)
     2943{
    30492944    WebFrameProxy* frame = m_process->webFrame(frameID);
    30502945    MESSAGE_CHECK(frame);
    30512946
    3052     m_policyClient->unableToImplementPolicy(this, frame, error, userData.get());
     2947    m_policyClient->unableToImplementPolicy(this, frame, error, m_process->transformHandlesToObjects(userData.object()).get());
    30532948}
    30542949
    30552950// FormClient
    30562951
    3057 void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, IPC::MessageDecoder& decoder)
    3058 {
    3059     RefPtr<API::Object> userData;
    3060     WebContextUserMessageDecoder messageDecoder(userData, process());
    3061     if (!decoder.decode(messageDecoder))
    3062         return;
    3063 
     2952void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, const UserData& userData)
     2953{
    30642954    WebFrameProxy* frame = m_process->webFrame(frameID);
    30652955    MESSAGE_CHECK(frame);
    … …  
    30692959
    30702960    RefPtr<WebFormSubmissionListenerProxy> listener = frame->setUpFormSubmissionListenerProxy(listenerID);
    3071     if (!m_formClient->willSubmitForm(this, frame, sourceFrame, textFieldValues, userData.get(), listener.get()))
     2961    if (!m_formClient->willSubmitForm(this, frame, sourceFrame, textFieldValues, m_process->transformHandlesToObjects(userData.object()).get(), listener.get()))
    30722962        listener->continueSubmission();
    30732963}
    … …  
    32203110}
    32213111
    3222 void WebPageProxy::mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t opaqueModifiers, IPC::MessageDecoder& decoder)
    3223 {
    3224     RefPtr<API::Object> userData;
    3225     WebContextUserMessageDecoder messageDecoder(userData, process());
    3226     if (!decoder.decode(messageDecoder))
    3227         return;
    3228 
     3112void WebPageProxy::mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t opaqueModifiers, const UserData& userData)
     3113{
    32293114    m_lastMouseMoveHitTestResult = WebHitTestResult::create(hitTestResultData);
    32303115
    32313116    WebEvent::Modifiers modifiers = static_cast<WebEvent::Modifiers>(opaqueModifiers);
    32323117
    3233     m_uiClient->mouseDidMoveOverElement(this, hitTestResultData, modifiers, userData.get());
    3234 }
    3235 
    3236 void WebPageProxy::didBeginTrackingPotentialLongMousePress(const IntPoint& mouseDownPosition, const WebHitTestResult::Data& hitTestResultData, IPC::MessageDecoder& decoder)
    3237 {
    3238     RefPtr<API::Object> userData;
    3239     WebContextUserMessageDecoder messageDecoder(userData, process());
    3240     if (!decoder.decode(messageDecoder))
    3241         return;
    3242 
    3243     m_uiClient->didBeginTrackingPotentialLongMousePress(this, mouseDownPosition, hitTestResultData, userData.get());
    3244 }
    3245 
    3246 void WebPageProxy::didRecognizeLongMousePress(IPC::MessageDecoder& decoder)
    3247 {
    3248     RefPtr<API::Object> userData;
    3249     WebContextUserMessageDecoder messageDecoder(userData, process());
    3250     if (!decoder.decode(messageDecoder))
    3251         return;
    3252 
    3253     m_uiClient->didRecognizeLongMousePress(this, userData.get());
    3254 }
    3255 
    3256 void WebPageProxy::didCancelTrackingPotentialLongMousePress(IPC::MessageDecoder& decoder)
    3257 {
    3258     RefPtr<API::Object> userData;
    3259     WebContextUserMessageDecoder messageDecoder(userData, process());
    3260     if (!decoder.decode(messageDecoder))
    3261         return;
    3262 
    3263     m_uiClient->didCancelTrackingPotentialLongMousePress(this, userData.get());
     3118    m_uiClient->mouseDidMoveOverElement(this, hitTestResultData, modifiers, m_process->transformHandlesToObjects(userData.object()).get());
     3119}
     3120
     3121void WebPageProxy::didBeginTrackingPotentialLongMousePress(const IntPoint& mouseDownPosition, const WebHitTestResult::Data& hitTestResultData, const UserData& userData)
     3122{
     3123    m_uiClient->didBeginTrackingPotentialLongMousePress(this, mouseDownPosition, hitTestResultData, m_process->transformHandlesToObjects(userData.object()).get());
     3124}
     3125
     3126void WebPageProxy::didRecognizeLongMousePress(const UserData& userData)
     3127{
     3128    m_uiClient->didRecognizeLongMousePress(this, m_process->transformHandlesToObjects(userData.object()).get());
     3129}
     3130
     3131void WebPageProxy::didCancelTrackingPotentialLongMousePress(const UserData& userData)
     3132{
     3133    m_uiClient->didCancelTrackingPotentialLongMousePress(this, m_process->transformHandlesToObjects(userData.object()).get());
    32643134}
    32653135
    … …  
    38803750
    38813751#if ENABLE(CONTEXT_MENUS)
    3882 void WebPageProxy::showContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, IPC::MessageDecoder& decoder)
    3883 {
    3884     internalShowContextMenu(menuLocation, contextMenuContextData, proposedItems, ContextMenuClientEligibility::EligibleForClient, &decoder);
     3752void WebPageProxy::showContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, const UserData& userData)
     3753{
     3754    internalShowContextMenu(menuLocation, contextMenuContextData, proposedItems, ContextMenuClientEligibility::EligibleForClient, userData);
    38853755   
    38863756    // No matter the result of internalShowContextMenu, always notify the WebProcess that the menu is hidden so it starts handling mouse events again.
    … …  
    38883758}
    38893759
    3890 void WebPageProxy::internalShowContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, ContextMenuClientEligibility clientEligibility, IPC::MessageDecoder* decoder)
    3891 {
    3892     RefPtr<API::Object> userData;
    3893     WebContextUserMessageDecoder messageDecoder(userData, process());
    3894     if (decoder && !decoder->decode(messageDecoder))
    3895         return;
    3896 
     3760void WebPageProxy::internalShowContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, ContextMenuClientEligibility clientEligibility, const UserData& userData)
     3761{
    38973762    m_activeContextMenuContextData = contextMenuContextData;
    38983763
    … …  
    39183783#endif
    39193784
    3920     if (askClientToChangeMenu && m_contextMenuClient.getContextMenuFromProposedMenu(this, proposedItems, items, contextMenuContextData.webHitTestResultData(), userData.get()))
     3785    if (askClientToChangeMenu && m_contextMenuClient.getContextMenuFromProposedMenu(this, proposedItems, items, contextMenuContextData.webHitTestResultData(), m_process->transformHandlesToObjects(userData.object()).get()))
    39213786        useProposedItems = false;
    39223787
    … …  
    54275292}
    54285293
    5429 void WebPageProxy::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result, bool forImmediateAction, IPC::MessageDecoder& decoder)
    5430 {
    5431     RefPtr<API::Object> userData;
    5432     WebContextUserMessageDecoder messageDecoder(userData, process());
    5433     if (!decoder.decode(messageDecoder))
    5434         return;
    5435 
    5436     m_pageClient.didPerformActionMenuHitTest(result, forImmediateAction, userData.get());
     5294void WebPageProxy::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result, bool forImmediateAction, const UserData& userData)
     5295{
     5296    m_pageClient.didPerformActionMenuHitTest(result, forImmediateAction, m_process->transformHandlesToObjects(userData.object()).get());
    54375297}
    54385298

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r177639 r177795  
    158158class RemoteScrollingCoordinatorProxy;
    159159class StringPairVector;
     160class UserData;
    160161class ViewSnapshot;
    161162class VisitedLinkProvider;
    … …  
    334335    void tryRestoreScrollPosition();
    335336    void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<WebBackForwardListItem>> removed);
    336     void willGoToBackForwardListItem(uint64_t itemID, IPC::MessageDecoder&);
     337    void willGoToBackForwardListItem(uint64_t itemID, const UserData&);
    337338
    338339    bool shouldKeepCurrentBackForwardListItemInList(WebBackForwardListItem*);
    … …  
    997998    void didCreateSubframe(uint64_t frameID);
    998999
    999     void didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, IPC::MessageDecoder&);
    1000     void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String&, IPC::MessageDecoder&);
    1001     void didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, IPC::MessageDecoder&);
    1002     void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, IPC::MessageDecoder&);
    1003     void didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, IPC::MessageDecoder&);
    1004     void didFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, IPC::MessageDecoder&);
    1005     void didFailLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, IPC::MessageDecoder&);
    1006     void didSameDocumentNavigationForFrame(uint64_t frameID, uint64_t navigationID, uint32_t sameDocumentNavigationType, const String&, IPC::MessageDecoder&);
    1007     void didReceiveTitleForFrame(uint64_t frameID, const String&, IPC::MessageDecoder&);
    1008     void didFirstLayoutForFrame(uint64_t frameID, IPC::MessageDecoder&);
    1009     void didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, IPC::MessageDecoder&);
    1010     void didLayout(uint32_t layoutMilestones, IPC::MessageDecoder&);
    1011     void didRemoveFrameFromHierarchy(uint64_t frameID, IPC::MessageDecoder&);
    1012     void didDisplayInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder&);
    1013     void didRunInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder&);
    1014     void didDetectXSSForFrame(uint64_t frameID, IPC::MessageDecoder&);
     1000    void didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, const UserData&);
     1001    void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String&, const UserData&);
     1002    void didFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, const UserData&);
     1003    void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, const UserData&);
     1004    void didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
     1005    void didFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
     1006    void didFailLoadForFrame(uint64_t frameID, uint64_t navigationID, const WebCore::ResourceError&, const UserData&);
     1007    void didSameDocumentNavigationForFrame(uint64_t frameID, uint64_t navigationID, uint32_t sameDocumentNavigationType, const String&, const UserData&);
     1008    void didReceiveTitleForFrame(uint64_t frameID, const String&, const UserData&);
     1009    void didFirstLayoutForFrame(uint64_t frameID, const UserData&);
     1010    void didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, const UserData&);
     1011    void didLayout(uint32_t layoutMilestones, const UserData&);
     1012    void didRemoveFrameFromHierarchy(uint64_t frameID, const UserData&);
     1013    void didDisplayInsecureContentForFrame(uint64_t frameID, const UserData&);
     1014    void didRunInsecureContentForFrame(uint64_t frameID, const UserData&);
     1015    void didDetectXSSForFrame(uint64_t frameID, const UserData&);
    10151016    void frameDidBecomeFrameSet(uint64_t frameID, bool);
    10161017    void didStartProgress();
    … …  
    10211022    void didDestroyNavigation(uint64_t navigationID);
    10221023
    1023     void decidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, IPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID);
    1024     void decidePolicyForNewWindowAction(uint64_t frameID, const NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, IPC::MessageDecoder&);
    1025     void decidePolicyForResponse(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder&);
    1026     void decidePolicyForResponseSync(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
    1027     void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, IPC::MessageDecoder&);
    1028 
    1029     void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, IPC::MessageDecoder&);
     1024    void decidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID);
     1025    void decidePolicyForNewWindowAction(uint64_t frameID, const NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, const UserData&);
     1026    void decidePolicyForResponse(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
     1027    void decidePolicyForResponseSync(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
     1028    void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, const UserData&);
     1029
     1030    void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, const UserData&);
    10301031
    10311032    // History client
    … …  
    10441045    void shouldInterruptJavaScript(bool& result);
    10451046    void setStatusText(const String&);
    1046     void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, IPC::MessageDecoder&);
    1047 
    1048     void didBeginTrackingPotentialLongMousePress(const WebCore::IntPoint& mouseDownPosition, const WebHitTestResult::Data& hitTestResultData, IPC::MessageDecoder&);
    1049     void didRecognizeLongMousePress(IPC::MessageDecoder&);
    1050     void didCancelTrackingPotentialLongMousePress(IPC::MessageDecoder&);
     1047    void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, const UserData&);
     1048
     1049    void didBeginTrackingPotentialLongMousePress(const WebCore::IntPoint& mouseDownPosition, const WebHitTestResult::Data& hitTestResultData, const UserData&);
     1050    void didRecognizeLongMousePress(const UserData&);
     1051    void didCancelTrackingPotentialLongMousePress(const UserData&);
    10511052
    10521053#if ENABLE(NETSCAPE_PLUGIN_API)
    … …  
    11631164        NotEligibleForClient
    11641165    };
    1165     void showContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, IPC::MessageDecoder&);
    1166     void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, ContextMenuClientEligibility, IPC::MessageDecoder*);
     1166    void showContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, const UserData&);
     1167    void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, ContextMenuClientEligibility, const UserData&);
    11671168#endif
    11681169
    … …  
    12811282    void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& geometries, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius);
    12821283
    1283     void startAssistingNode(const AssistedNodeInformation&, bool userIsInteracting, bool blurPreviousNode, IPC::MessageDecoder&);
     1284    void startAssistingNode(const AssistedNodeInformation&, bool userIsInteracting, bool blurPreviousNode, const UserData&);
    12841285    void stopAssistingNode();
    12851286
    … …  
    13401341
    13411342#if PLATFORM(MAC)
    1342     void didPerformActionMenuHitTest(const ActionMenuHitTestResult&, bool forImmediateAction, IPC::MessageDecoder&);
     1343    void didPerformActionMenuHitTest(const ActionMenuHitTestResult&, bool forImmediateAction, const UserData&);
    13431344#endif
    13441345

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r177636 r177795  
    3030    RunJavaScriptPrompt(uint64_t frameID, String message, String defaultValue) -> (String result) Delayed
    3131    ShouldInterruptJavaScript() -> (bool shouldInterupt)
    32     MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    33 
    34     DidBeginTrackingPotentialLongMousePress(WebCore::IntPoint mouseDownPosition, WebKit::WebHitTestResult::Data hitTestResultData, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    35     DidRecognizeLongMousePress(WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    36     DidCancelTrackingPotentialLongMousePress(WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     32    MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::UserData userData)
     33
     34    DidBeginTrackingPotentialLongMousePress(WebCore::IntPoint mouseDownPosition, WebKit::WebHitTestResult::Data hitTestResultData, WebKit::UserData userData)
     35    DidRecognizeLongMousePress(WebKit::UserData userData)
     36    DidCancelTrackingPotentialLongMousePress(WebKit::UserData userData)
    3737
    3838#if ENABLE(NETSCAPE_PLUGIN_API)
    … …  
    115115
    116116    # Policy messages
    117     DecidePolicyForResponseSync(uint64_t frameID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID) Variadic
    118     DecidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID) Variadic
    119     DecidePolicyForNewWindowAction(uint64_t frameID, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    120     UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData)  Variadic
     117    DecidePolicyForResponseSync(uint64_t frameID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID)
     118    DecidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID)
     119    DecidePolicyForNewWindowAction(uint64_t frameID, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
     120    UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)
    121121
    122122    # Progress messages
    … …  
    132132
    133133    # Frame load messages
    134     DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, String unreachableURL, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    135     DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    136     DidFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    137     DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    138     DidFailLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    139     DidFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    140     DidFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    141     DidFirstLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    142     DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    143     DidLayout(uint32_t type, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    144     DidRemoveFrameFromHierarchy(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    145     DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    146     DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    147     DidRunInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    148     DidDetectXSSForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    149     DidSameDocumentNavigationForFrame(uint64_t frameID, uint64_t navigationID, uint32_t type, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     134    DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, String unreachableURL, WebKit::UserData userData)
     135    DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, WebKit::UserData userData)
     136    DidFailProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::UserData userData)
     137    DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::UserData userData)
     138    DidFailLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::UserData userData)
     139    DidFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
     140    DidFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
     141    DidFirstLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
     142    DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
     143    DidLayout(uint32_t type, WebKit::UserData userData)
     144    DidRemoveFrameFromHierarchy(uint64_t frameID, WebKit::UserData userData)
     145    DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::UserData userData)
     146    DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
     147    DidRunInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
     148    DidDetectXSSForFrame(uint64_t frameID, WebKit::UserData userData)
     149    DidSameDocumentNavigationForFrame(uint64_t frameID, uint64_t navigationID, uint32_t type, String url, WebKit::UserData userData)
    150150    DidDestroyNavigation(uint64_t navigationID)
    151151
    … …  
    162162
    163163    # Forms messages
    164     WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, Vector<std::pair<String, String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     164    WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, Vector<std::pair<String, String>> textFieldValues, uint64_t listenerID, WebKit::UserData userData)
    165165
    166166    # Callback messages
    … …  
    219219    BackForwardForwardListCount() -> (int32_t count)
    220220    BackForwardClear()
    221     WillGoToBackForwardListItem(uint64_t itemID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     221    WillGoToBackForwardListItem(uint64_t itemID, WebKit::UserData userData)
    222222
    223223    # Undo/Redo messages
    … …  
    247247#if ENABLE(CONTEXT_MENUS)
    248248    # ContextMenu messages
    249     ShowContextMenu(WebCore::IntPoint menuLocation, WebKit::ContextMenuContextData contextMenuContextData, Vector<WebKit::WebContextMenuItemData> items, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     249    ShowContextMenu(WebCore::IntPoint menuLocation, WebKit::ContextMenuContextData contextMenuContextData, Vector<WebKit::WebContextMenuItemData> items, WebKit::UserData userData)
    250250#endif
    251251
    … …  
    358358    DidGetTapHighlightGeometries(uint64_t requestID, WebCore::Color color, Vector<WebCore::FloatQuad> geometries, WebCore::IntSize topLeftRadius, WebCore::IntSize topRightRadius, WebCore::IntSize bottomLeftRadius, WebCore::IntSize bottomRightRadius)
    359359
    360     StartAssistingNode(struct WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     360    StartAssistingNode(struct WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, WebKit::UserData userData)
    361361    StopAssistingNode()
    362362    NotifyRevealedSelection()
    … …  
    421421
    422422#if PLATFORM(MAC)
    423     DidPerformActionMenuHitTest(struct WebKit::ActionMenuHitTestResult result, bool forImmediateAction, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     423    DidPerformActionMenuHitTest(struct WebKit::ActionMenuHitTestResult result, bool forImmediateAction, WebKit::UserData userData)
    424424#endif
    425425}

  • trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

    r177692 r177795  
    653653    ContextMenuContextData contextData(selectionAsRTFD.vector(), telephoneNumbers, isEditable);
    654654
    655     internalShowContextMenu(point, contextData, items, ContextMenuClientEligibility::NotEligibleForClient, nullptr);
     655    internalShowContextMenu(point, contextData, items, ContextMenuClientEligibility::NotEligibleForClient, UserData());
    656656}
    657657#endif

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r177639 r177795  
    3535#include "NavigationActionData.h"
    3636#include "PageBanner.h"
     37#include "UserData.h"
    3738#include "WebColorChooser.h"
    3839#include "WebCoreArgumentCoders.h"
    … …  
    600601    // Notify the UIProcess.
    601602    WebHitTestResult::Data webHitTestResultData(hitTestResult);
    602     m_page->send(Messages::WebPageProxy::MouseDidMoveOverElement(webHitTestResultData, modifierFlags, InjectedBundleUserMessageEncoder(userData.get())));
     603    m_page->send(Messages::WebPageProxy::MouseDidMoveOverElement(webHitTestResultData, modifierFlags, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    603604}
    604605
    … …  
    612613    // Notify the UIProcess.
    613614    WebHitTestResult::Data webHitTestResultData(hitTestResult);
    614     m_page->send(Messages::WebPageProxy::DidBeginTrackingPotentialLongMousePress(mouseDownPosition, webHitTestResultData, InjectedBundleUserMessageEncoder(userData.get())));
     615    m_page->send(Messages::WebPageProxy::DidBeginTrackingPotentialLongMousePress(mouseDownPosition, webHitTestResultData, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    615616}
    616617
    … …  
    623624
    624625    // Notify the UIProcess.
    625     m_page->send(Messages::WebPageProxy::DidRecognizeLongMousePress(InjectedBundleUserMessageEncoder(userData.get())));
     626    m_page->send(Messages::WebPageProxy::DidRecognizeLongMousePress(UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    626627}
    627628
    … …  
    634635
    635636    // Notify the UIProcess.
    636     m_page->send(Messages::WebPageProxy::DidCancelTrackingPotentialLongMousePress(InjectedBundleUserMessageEncoder(userData.get())));
     637    m_page->send(Messages::WebPageProxy::DidCancelTrackingPotentialLongMousePress(UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    637638}
    638639

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r177692 r177795  
    3737#include "NavigationActionData.h"
    3838#include "PluginView.h"
     39#include "UserData.h"
    3940#include "WKBundleAPICast.h"
    4041#include "WebBackForwardListProxy.h"
    … …  
    148149
    149150    // Notify the UIProcess.
    150     webPage->send(Messages::WebPageProxy::DidRemoveFrameFromHierarchy(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
    151 
     151    webPage->send(Messages::WebPageProxy::DidRemoveFrameFromHierarchy(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    152152}
    153153
    … …  
    292292
    293293    // Notify the UIProcess.
    294     webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), url, InjectedBundleUserMessageEncoder(userData.get())));
     294    webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), url, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    295295}
    296296
    … …  
    328328    // Notify the UIProcess.
    329329    WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
    330     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationAnchorNavigation, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     330    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationAnchorNavigation, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    331331}
    332332
    … …  
    344344    // Notify the UIProcess.
    345345    WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
    346     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePush, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     346    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePush, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    347347}
    348348
    … …  
    360360    // Notify the UIProcess.
    361361    WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
    362     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStateReplace, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     362    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStateReplace, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    363363}
    364364
    … …  
    376376    // Notify the UIProcess.
    377377    WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
    378     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePop, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     378    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePop, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    379379}
    380380
    … …  
    414414
    415415    // Notify the UIProcess.
    416     webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), provisionalLoader.navigationID(), url, unreachableURL, InjectedBundleUserMessageEncoder(userData.get())));
     416    webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), provisionalLoader.navigationID(), url, unreachableURL, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    417417}
    418418
    … …  
    430430
    431431    // Notify the UIProcess.
    432     webPage->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title.string(), InjectedBundleUserMessageEncoder(userData.get())));
     432    webPage->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title.string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    433433}
    434434
    … …  
    454454    // Notify the UIProcess.
    455455
    456     webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), documentLoader.response().certificateInfo(), InjectedBundleUserMessageEncoder(userData.get())));
     456    webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), documentLoader.response().certificateInfo(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    457457    webPage->didCommitLoad(m_frame);
    458458}
    … …  
    474474
    475475    // Notify the UIProcess.
    476     webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), navigationID, error, InjectedBundleUserMessageEncoder(userData.get())));
     476    webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), navigationID, error, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    477477
    478478    // If we have a load listener, notify it.
    … …  
    494494    // Notify the UIProcess.
    495495    WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
    496     webPage->send(Messages::WebPageProxy::DidFailLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), error, InjectedBundleUserMessageEncoder(userData.get())));
     496    webPage->send(Messages::WebPageProxy::DidFailLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), error, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    497497
    498498    // If we have a load listener, notify it.
    … …  
    515515
    516516    // Notify the UIProcess.
    517     webPage->send(Messages::WebPageProxy::DidFinishDocumentLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), InjectedBundleUserMessageEncoder(userData.get())));
     517    webPage->send(Messages::WebPageProxy::DidFinishDocumentLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    518518}
    519519
    … …  
    532532
    533533    // Notify the UIProcess.
    534     webPage->send(Messages::WebPageProxy::DidFinishLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), InjectedBundleUserMessageEncoder(userData.get())));
     534    webPage->send(Messages::WebPageProxy::DidFinishLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    535535
    536536    // If we have a load listener, notify it.
    … …  
    566566        // new didLayout API.
    567567        webPage->injectedBundleLoaderClient().didFirstLayoutForFrame(webPage, m_frame, userData);
    568         webPage->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
     568        webPage->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    569569
    570570#if PLATFORM(MAC)
    … …  
    584584    // Send this after DidFirstLayout-specific calls since some clients expect to get those messages first.
    585585    webPage->injectedBundleLoaderClient().didLayout(webPage, milestones, userData);
    586     webPage->send(Messages::WebPageProxy::DidLayout(milestones, InjectedBundleUserMessageEncoder(userData.get())));
     586    webPage->send(Messages::WebPageProxy::DidLayout(milestones, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    587587
    588588    if (milestones & DidFirstVisuallyNonEmptyLayout) {
    … …  
    595595        // double duty with the new didLayout API.
    596596        webPage->injectedBundleLoaderClient().didFirstVisuallyNonEmptyLayoutForFrame(webPage, m_frame, userData);
    597         webPage->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
     597        webPage->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    598598    }
    599599}
    … …  
    677677    if (WebPage::synchronousMessagesShouldSpinRunLoop())
    678678        syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
    679     if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags))
     679    if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags))
    680680        return;
    681681
    … …  
    712712    navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
    713713
    714     webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationActionData, request, frameName, listenerID, InjectedBundleUserMessageEncoder(userData.get())));
     714    webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationActionData, request, frameName, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    715715}
    716716
    … …  
    779779
    780780    // Notify the UIProcess.
    781     if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, navigationAction.resourceRequest(), request, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID)))
     781    if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID)))
    782782        return;
    783783
    … …  
    804804
    805805    // Notify the UIProcess.
    806     webPage->send(Messages::WebPageProxy::UnableToImplementPolicy(m_frame->frameID(), error, InjectedBundleUserMessageEncoder(userData.get())));
     806    webPage->send(Messages::WebPageProxy::UnableToImplementPolicy(m_frame->frameID(), error, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    807807}
    808808
    … …  
    844844    uint64_t listenerID = m_frame->setUpPolicyListener(WTF::move(function));
    845845
    846     webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), values, listenerID, InjectedBundleUserMessageEncoder(userData.get())));
     846    webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), values, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    847847}
    848848
    … …  
    10001000        return false;
    10011001
    1002     webPage->send(Messages::WebPageProxy::WillGoToBackForwardListItem(itemID, InjectedBundleUserMessageEncoder(userData.get())));
     1002    webPage->send(Messages::WebPageProxy::WillGoToBackForwardListItem(itemID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    10031003    return true;
    10041004}
    … …  
    10141014    webPage->injectedBundleLoaderClient().didDisplayInsecureContentForFrame(webPage, m_frame, userData);
    10151015
    1016     webPage->send(Messages::WebPageProxy::DidDisplayInsecureContentForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
     1016    webPage->send(Messages::WebPageProxy::DidDisplayInsecureContentForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    10171017}
    10181018
    … …  
    10271027    webPage->injectedBundleLoaderClient().didRunInsecureContentForFrame(webPage, m_frame, userData);
    10281028
    1029     webPage->send(Messages::WebPageProxy::DidRunInsecureContentForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
     1029    webPage->send(Messages::WebPageProxy::DidRunInsecureContentForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    10301030}
    10311031
    … …  
    10401040    webPage->injectedBundleLoaderClient().didDetectXSSForFrame(webPage, m_frame, userData);
    10411041
    1042     webPage->send(Messages::WebPageProxy::DidDetectXSSForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
     1042    webPage->send(Messages::WebPageProxy::DidDetectXSSForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    10431043}
    10441044

  • trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp

    r167956 r177795  
    2929#include "InjectedBundleHitTestResult.h"
    3030#include "InjectedBundleUserMessageCoders.h"
     31#include "UserData.h"
    3132#include "WebCoreArgumentCoders.h"
    3233#include "WebHitTestResult.h"
    … …  
    6970    // Mark the WebPage has having a shown context menu then notify the UIProcess.
    7071    m_page->contextMenuShowing();
    71     m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame()), contextMenuContextData, menuItems, InjectedBundleUserMessageEncoder(userData.get())));
     72    m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame()), contextMenuContextData, menuItems, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    7273}
    7374

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r177528 r177795  
    4141#import "PluginView.h"
    4242#import "PrintInfo.h"
     43#import "UserData.h"
    4344#import "WKAccessibilityWebPageObjectMac.h"
    4445#import "WebCoreArgumentCoders.h"
    … …  
    992993    MainFrame& mainFrame = corePage()->mainFrame();
    993994    if (!mainFrame.view() || !mainFrame.view()->renderView()) {
    994         send(Messages::WebPageProxy::DidPerformActionMenuHitTest(ActionMenuHitTestResult(), forImmediateAction, InjectedBundleUserMessageEncoder(nullptr)));
     995        send(Messages::WebPageProxy::DidPerformActionMenuHitTest(ActionMenuHitTestResult(), forImmediateAction, UserData()));
    995996        return;
    996997    }
    … …  
    10831084    injectedBundleContextMenuClient().prepareForActionMenu(this, injectedBundleHitTestResult.get(), userData);
    10841085
    1085     send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult, forImmediateAction, InjectedBundleUserMessageEncoder(userData.get())));
     1086    send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult, forImmediateAction, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
    10861087}
    10871088
Note: See TracChangeset for help on using the changeset viewer.