2008-04-01 Holger Hans Peter Freyther <holger.freyther@trolltech.com>

        Reviewed by Simon.

        * Change the order of the methods to match with the FrameLoaderClient.h to ease
        removing methods in the future.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 018a0cf..027a122 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Simon.
 
 
         Reviewed by Simon.
 

+        * Change the order of the methods to match with the FrameLoaderClient.h to ease
+        removing methods in the future.
+
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
+2008-04-01  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Simon.
+

         * Remove virtuals in the FrameLoaderClientQt that don't exist in the base class.
 
         * WebCoreSupport/FrameLoaderClientQt.cpp:
         * Remove virtuals in the FrameLoaderClientQt that don't exist in the base class.
 
         * WebCoreSupport/FrameLoaderClientQt.cpp:

diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
index 81a5521..e4af56b 100644 (file)
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
@@ -67,6 +67,8 @@ namespace WebCore {
     public:
         FrameLoaderClientQt();
         ~FrameLoaderClientQt();
     public:
         FrameLoaderClientQt();
         ~FrameLoaderClientQt();

+        virtual void frameLoaderDestroyed();
+

         void setFrame(QWebFrame* webFrame, Frame* frame);
         QWebFrame* webFrame() const;
 
         void setFrame(QWebFrame* webFrame, Frame* frame);
         QWebFrame* webFrame() const;
 


@@ -83,8 +85,16 @@ namespace WebCore {
         virtual void detachedFromParent3();
         virtual void detachedFromParent4();
 
         virtual void detachedFromParent3();
         virtual void detachedFromParent4();
 

-        virtual void frameLoaderDestroyed();
-        virtual bool canHandleRequest(const WebCore::ResourceRequest&) const;
+        virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&);
+
+        virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long, WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+        virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&);
+        virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&);
+        virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long, const WebCore::ResourceResponse&);
+        virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long, int);
+        virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long);
+        virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long, const WebCore::ResourceError&);
+        virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int);

 
         virtual void dispatchDidHandleOnloadEvents();
         virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
 
         virtual void dispatchDidHandleOnloadEvents();
         virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();


@@ -96,33 +106,68 @@ namespace WebCore {
         virtual void dispatchDidStartProvisionalLoad();
         virtual void dispatchDidReceiveTitle(const String& title);
         virtual void dispatchDidCommitLoad();
         virtual void dispatchDidStartProvisionalLoad();
         virtual void dispatchDidReceiveTitle(const String& title);
         virtual void dispatchDidCommitLoad();

-
+        virtual void dispatchDidFailProvisionalLoad(const ResourceError&);
+        virtual void dispatchDidFailLoad(const WebCore::ResourceError&);

         virtual void dispatchDidFinishDocumentLoad();
         virtual void dispatchDidFinishLoad();
         virtual void dispatchDidFirstLayout();
 
         virtual void dispatchDidFinishDocumentLoad();
         virtual void dispatchDidFinishLoad();
         virtual void dispatchDidFirstLayout();
 

+        virtual WebCore::Frame* dispatchCreatePage();

         virtual void dispatchShow();
         virtual void dispatchShow();

+
+        virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction function, const WebCore::String&, const WebCore::ResourceRequest&);
+        virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String&);
+        virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const WebCore::NavigationAction&, const WebCore::ResourceRequest&);

         virtual void cancelPolicyCheck();
 
         virtual void cancelPolicyCheck();
 

+        virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
+

         virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>);
 
         virtual void dispatchDidLoadMainResource(DocumentLoader*);
         virtual void revertToProvisionalState(DocumentLoader*);
         virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>);
 
         virtual void dispatchDidLoadMainResource(DocumentLoader*);
         virtual void revertToProvisionalState(DocumentLoader*);

+        virtual void setMainDocumentError(DocumentLoader*, const ResourceError&);
+
+        virtual void postProgressStartedNotification();
+        virtual void postProgressEstimateChangedNotification();
+        virtual void postProgressFinishedNotification();

 
         virtual void setMainFrameDocumentReady(bool);
 
         virtual void setMainFrameDocumentReady(bool);

+
+        virtual void startDownload(const WebCore::ResourceRequest&);
+

         virtual void willChangeTitle(DocumentLoader*);
         virtual void didChangeTitle(DocumentLoader*);
         virtual void willChangeTitle(DocumentLoader*);
         virtual void didChangeTitle(DocumentLoader*);

+
+        virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);

         virtual void finishedLoading(DocumentLoader*);
 
         virtual void finishedLoading(DocumentLoader*);
 

+        virtual void updateGlobalHistory(const KURL&);
+        virtual bool shouldGoToHistoryItem(HistoryItem*) const;
+
+        virtual ResourceError cancelledError(const ResourceRequest&);
+        virtual ResourceError blockedError(const ResourceRequest&);
+        virtual ResourceError cannotShowURLError(const ResourceRequest&);
+        virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
+
+        virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);
+        virtual ResourceError fileDoesNotExistError(const ResourceResponse&);
+
+        virtual bool shouldFallBack(const ResourceError&);
+
+        virtual bool canHandleRequest(const WebCore::ResourceRequest&) const;

         virtual bool canShowMIMEType(const String& MIMEType) const;
         virtual bool representationExistsForURLScheme(const String& URLScheme) const;
         virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const;
 
         virtual void frameLoadCompleted();
         virtual bool canShowMIMEType(const String& MIMEType) const;
         virtual bool representationExistsForURLScheme(const String& URLScheme) const;
         virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const;
 
         virtual void frameLoadCompleted();

+        virtual void saveViewStateToItem(WebCore::HistoryItem*);

         virtual void restoreViewState();
         virtual void provisionalLoadStarted();
         virtual void didFinishLoad();
         virtual void prepareForDataSourceReplacement();
         virtual void restoreViewState();
         virtual void provisionalLoadStarted();
         virtual void didFinishLoad();
         virtual void prepareForDataSourceReplacement();

+
+        virtual WTF::PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);

         virtual void setTitle(const String& title, const KURL&);
 
         virtual String userAgent(const WebCore::KURL&);
         virtual void setTitle(const String& title, const KURL&);
 
         virtual String userAgent(const WebCore::KURL&);


@@ -130,61 +175,23 @@ namespace WebCore {
         virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
         virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
         virtual void transitionToCommittedForNewPage();
         virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
         virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
         virtual void transitionToCommittedForNewPage();

-        
-        virtual void updateGlobalHistory(const WebCore::KURL&);
-        virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
-        virtual void saveViewStateToItem(WebCore::HistoryItem*);
+

         virtual bool canCachePage() const;
         virtual bool canCachePage() const;

-        
-        virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&);
-        virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
-        virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
-        virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
-        virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
-        virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
-        virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
-        virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
-        virtual bool shouldFallBack(const WebCore::ResourceError&);
-        virtual WTF::PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);

         virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
 
         virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
 

-        virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&);
-        
-        virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long, WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
-        virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&);
-        virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&);
-        virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long, const WebCore::ResourceResponse&);
-        virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long, int);
-        virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long);
-        virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long, const WebCore::ResourceError&);
-
-        virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int);
-        virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
-        virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
-        virtual WebCore::Frame* dispatchCreatePage();
-        virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction function, const WebCore::String&, const WebCore::ResourceRequest&);
-        virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String&);
-        virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const WebCore::NavigationAction&, const WebCore::ResourceRequest&);
-        virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
-
-        virtual void startDownload(const WebCore::ResourceRequest&);
-
-        virtual void postProgressStartedNotification();
-        virtual void postProgressEstimateChangedNotification();
-        virtual void postProgressFinishedNotification();
-

         virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                    const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) ;
         virtual Widget* createPlugin(const IntSize&, Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool);
         virtual void redirectDataToPlugin(Widget* pluginWidget);
         virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                    const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) ;
         virtual Widget* createPlugin(const IntSize&, Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool);
         virtual void redirectDataToPlugin(Widget* pluginWidget);

+

         virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
 
         virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
         virtual String overrideMediaType() const;
         virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
 
         virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
         virtual String overrideMediaType() const;

-        
+

         virtual void windowObjectCleared();
         virtual void didPerformFirstNavigation() const;
         virtual void windowObjectCleared();
         virtual void didPerformFirstNavigation() const;

-        
+

         virtual void registerForIconNotification(bool);
 
         QString chooseFile(const QString& oldFile);
         virtual void registerForIconNotification(bool);
 
         QString chooseFile(const QString& oldFile);