Changeset 19341 in webkit
- Timestamp:
- Feb 1, 2007 11:57:05 AM (17 years ago)
- Location:
- trunk/WebKitQt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitQt/ChangeLog
r19303 r19341 1 2007-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 1 15 2007-01-31 Zack Rusin <zrusin@trolltech.com> 2 16 -
trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
r19293 r19341 90 90 void FrameLoaderClientQt::callPolicyFunction(FramePolicyFunction function, PolicyAction action) 91 91 { 92 qDebug() << "FrameLoaderClientQt::callPolicyFunction";93 92 ASSERT(!m_policyFunction); 93 ASSERT(function); 94 94 95 95 m_policyFunction = function; … … 99 99 void FrameLoaderClientQt::slotCallPolicyFunction(int action) 100 100 { 101 qDebug() << "FrameLoaderClientQt::slotCallPolicyFunction";102 101 if (!m_frame || !m_policyFunction) 103 102 return; 104 (m_frame->loader()->*m_policyFunction)(WebCore::PolicyAction(action));103 FramePolicyFunction function = m_policyFunction; 105 104 m_policyFunction = 0; 105 (m_frame->loader()->*function)(WebCore::PolicyAction(action)); 106 106 } 107 107 … … 372 372 { 373 373 notImplemented(); 374 Q_ASSERT(!m_policyFunction); 374 375 // FIXME: This is surely too simple 375 376 callPolicyFunction(function, PolicyUse); … … 772 773 { 773 774 // we need to call directly here 775 Q_ASSERT(!m_policyFunction); 774 776 m_policyFunction = function; 775 777 slotCallPolicyFunction(PolicyUse); … … 779 781 { 780 782 notImplemented(); 783 Q_ASSERT(!m_policyFunction); 781 784 callPolicyFunction(function, PolicyIgnore); 782 785 } … … 784 787 void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const WebCore::NavigationAction&, const WebCore::ResourceRequest& request) 785 788 { 786 789 Q_ASSERT(!m_policyFunction); 787 790 KURL url = request.url(); 788 791 if (url.isEmpty() || url.protocol() == "about") {
Note: See TracChangeset
for help on using the changeset viewer.