Changeset 19341 in webkit


Ignore:
Timestamp:
Feb 1, 2007 11:57:05 AM (17 years ago)
Author:
lars
Message:

Reviewed by Adam.

Fix form loading for the Qt build.

Location:
trunk/WebKitQt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitQt/ChangeLog

    r19303 r19341  
     12007-02-01  Lars Knoll <lars@trolltech.com>
     2
     3        Reviewed by Adam.
     4
     5        Fix form loading for the Qt build.
     6
     7        * WebCoreSupport/FrameLoaderClientQt.cpp:
     8        (WebCore::FrameLoaderClientQt::callPolicyFunction):
     9        (WebCore::FrameLoaderClientQt::slotCallPolicyFunction):
     10        (WebCore::FrameLoaderClientQt::dispatchWillSubmitForm):
     11        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType):
     12        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction):
     13        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
     14
    1152007-01-31  Zack Rusin  <zrusin@trolltech.com>
    216
  • trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp

    r19293 r19341  
    9090void FrameLoaderClientQt::callPolicyFunction(FramePolicyFunction function, PolicyAction action)
    9191{
    92     qDebug() << "FrameLoaderClientQt::callPolicyFunction";
    9392    ASSERT(!m_policyFunction);
     93    ASSERT(function);
    9494
    9595    m_policyFunction = function;
     
    9999void FrameLoaderClientQt::slotCallPolicyFunction(int action)
    100100{
    101     qDebug() << "FrameLoaderClientQt::slotCallPolicyFunction";
    102101    if (!m_frame || !m_policyFunction)
    103102        return;
    104     (m_frame->loader()->*m_policyFunction)(WebCore::PolicyAction(action));
     103    FramePolicyFunction function = m_policyFunction;
    105104    m_policyFunction = 0;
     105    (m_frame->loader()->*function)(WebCore::PolicyAction(action));
    106106}
    107107
     
    372372{
    373373    notImplemented();
     374    Q_ASSERT(!m_policyFunction);
    374375    // FIXME: This is surely too simple
    375376    callPolicyFunction(function, PolicyUse);
     
    772773{
    773774    // we need to call directly here
     775    Q_ASSERT(!m_policyFunction);
    774776    m_policyFunction = function;
    775777    slotCallPolicyFunction(PolicyUse);
     
    779781{
    780782    notImplemented();
     783    Q_ASSERT(!m_policyFunction);
    781784    callPolicyFunction(function, PolicyIgnore);
    782785}
     
    784787void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const WebCore::NavigationAction&, const WebCore::ResourceRequest& request)
    785788{
    786 
     789    Q_ASSERT(!m_policyFunction);
    787790    KURL url = request.url();
    788791    if (url.isEmpty() || url.protocol() == "about") {
Note: See TracChangeset for help on using the changeset viewer.