2007-07-17 Ada Chan <adachan@apple.com>

        Rubbet-stamped by Adam.

        Fixed build.

        * Interfaces/IWebFramePrivate.idl:
        * WebContextMenuClient.cpp:
        (fixMenuReceivedFromOldSafari):
        * WebFrame.cpp:
        (WebFrame::loadURLIntoChild):
        (WebFrame::download):
        * WebFrame.h:

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

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 6c4ea44e5296353592d099fcf8d4ef1b83c68ea8..d1c93fdebd4b28d29ae07c133410749af2bb924b 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-17  Ada Chan  <adachan@apple.com>
+
+        Rubbet-stamped by Adam.
+        
+        Fixed build.
+
+        * Interfaces/IWebFramePrivate.idl:
+        * WebContextMenuClient.cpp:
+        (fixMenuReceivedFromOldSafari):
+        * WebFrame.cpp:
+        (WebFrame::loadURLIntoChild):
+        (WebFrame::download):
+        * WebFrame.h:
+
 2007-07-17  Adam Roben  <aroben@apple.com>
 
         Fix Bug 14324: Cannot remove/customize the "Inspect Element" contextual menu item

diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index 4f5510d379f54a06c35a368816f31ae43061b4e7..c986665950c33fc5b864788c34adeb0f75b68dbe 100755 (executable)
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -60,7 +60,7 @@ typedef enum {
     WebFrameLoadTypeReload,
     WebFrameLoadTypeReloadAllowingStaleData,
     WebFrameLoadTypeSame,               // user loads same URL again (but not reload button)
-    WebFrameLoadTypeInternal,
+    WebFrameLoadTypeRedirectWithLockedHistory,
     WebFrameLoadTypeReplace
 } WebFrameLoadType;
 

diff --git a/WebKit/win/WebContextMenuClient.cpp b/WebKit/win/WebContextMenuClient.cpp
index d91d2ff2ceb3ec734ade1f610c286c386fd07a80..6512b3802f255a6f659b70c330fc30894af9e458 100644 (file)
--- a/WebKit/win/WebContextMenuClient.cpp
+++ b/WebKit/win/WebContextMenuClient.cpp
@@ -74,7 +74,7 @@ static bool isPreInspectElementTagSafari(IWebUIDelegate* uiDelegate)
 
 static HMENU fixMenuReceivedFromOldSafari(IWebUIDelegate* uiDelegate, ContextMenu* originalMenu, HMENU menuFromClient)
 {
-    ASSERT_ARG(menu, menu);
+    ASSERT_ARG(originalMenu, originalMenu);
     if (!isPreInspectElementTagSafari(uiDelegate))
         return menuFromClient;
 

diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 81bc59f954cf249dfcb70f38dad4c47668fc9861..c79584a13a99c972ebcbded292dcc0f923e0caf4 100644 (file)
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -1286,7 +1286,7 @@ void WebFrame::loadURLIntoChild(const KURL& originalURL, const String& referrer,
 
     HistoryItem* parentItem = coreFrame->loader()->currentHistoryItem();
     FrameLoadType loadType = coreFrame->loader()->loadType();
-    FrameLoadType childLoadType = FrameLoadTypeInternal;
+    FrameLoadType childLoadType = FrameLoadTypeRedirectWithLockedHistory;
 
     KURL url = originalURL;
 
@@ -2005,7 +2005,7 @@ void WebFrame::dispatchUnableToImplementPolicy(const ResourceError& error)
     }
 }
 
-void WebFrame::download(ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
+void WebFrame::download(ResourceHandle* handle, const ResourceRequest& request, const ResourceRequest&, const ResourceResponse& response)
 {
     COMPtr<IWebDownloadDelegate> downloadDelegate;
     COMPtr<IWebView> webView;

diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index 4d3c4120ef5628641007b5040c4ba996bad88a25..c9dae2c791837f602aa1edc732d298cad9480ce9 100644 (file)
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -282,7 +282,7 @@ public:
     virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&);
     virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
     virtual bool willUseArchive(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, const WebCore::KURL& originalURL) const;
-    virtual void download(WebCore::ResourceHandle*, 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 identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);