Changeset 142839 in webkit


Ignore:
Timestamp:
Feb 13, 2013 6:11:39 PM (11 years ago)
Author:
andersca@apple.com
Message:

Remove StringPairVector
https://bugs.webkit.org/show_bug.cgi?id=109778

Reviewed by Ryosuke Niwa.

Our message generation scripts can handle nested template parameter types now,
so we no longer need to use StringPairVector.

  • Shared/StringPairVector.h: Removed.
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::willSubmitForm):

  • UIProcess/WebPageProxy.h:

(WebPageProxy):

  • UIProcess/WebPageProxy.messages.in:
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchWillSubmitForm):

Location:
trunk/Source/WebKit2
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r142836 r142839  
     12013-02-13  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove StringPairVector
     4        https://bugs.webkit.org/show_bug.cgi?id=109778
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Our message generation scripts can handle nested template parameter types now,
     9        so we no longer need to use StringPairVector.
     10
     11        * Shared/StringPairVector.h: Removed.
     12        * UIProcess/WebPageProxy.cpp:
     13        (WebKit::WebPageProxy::willSubmitForm):
     14        * UIProcess/WebPageProxy.h:
     15        (WebPageProxy):
     16        * UIProcess/WebPageProxy.messages.in:
     17        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     18        (WebKit::WebFrameLoaderClient::dispatchWillSubmitForm):
     19
    1202013-02-13  Dean Jackson  <dino@apple.com>
    221
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r142704 r142839  
    4646#include "PrintInfo.h"
    4747#include "SessionState.h"
    48 #include "StringPairVector.h"
    4948#include "TextChecker.h"
    5049#include "TextCheckerState.h"
     
    24122411// FormClient
    24132412
    2414 void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const StringPairVector& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
     2413void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String> >& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
    24152414{
    24162415    RefPtr<APIObject> userData;
     
    24262425
    24272426    RefPtr<WebFormSubmissionListenerProxy> listener = frame->setUpFormSubmissionListenerProxy(listenerID);
    2428     if (!m_formClient.willSubmitForm(this, frame, sourceFrame, textFieldValues.stringPairVector(), userData.get(), listener.get()))
     2427    if (!m_formClient.willSubmitForm(this, frame, sourceFrame, textFieldValues, userData.get(), listener.get()))
    24292428        listener->continueSubmission();
    24302429}
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r142160 r142839  
    799799    void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
    800800
    801     void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const StringPairVector& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder&);
     801    void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String> >& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder&);
    802802
    803803    // UI client
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r142160 r142839  
    143143
    144144    # Forms messages
    145     WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WebKit::StringPairVector textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     145    WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WTF::Vector<std::pair<WTF::String, WTF::String> > textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    146146
    147147    # Callback messages
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r141708 r142839  
    3636#include "PlatformCertificateInfo.h"
    3737#include "PluginView.h"
    38 #include "StringPairVector.h"
    3938#include "WebBackForwardListProxy.h"
    4039#include "WebContextMessages.h"
     
    760759
    761760    uint64_t listenerID = m_frame->setUpPolicyListener(function);
    762     StringPairVector valuesVector(values);
    763 
    764     webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), valuesVector, listenerID, InjectedBundleUserMessageEncoder(userData.get())));
     761
     762    webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), values, listenerID, InjectedBundleUserMessageEncoder(userData.get())));
    765763}
    766764
Note: See TracChangeset for help on using the changeset viewer.