2006-12-08 Don Gibson <dgibson77@gmail.com>
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Dec 2006 21:21:30 +0000 (21:21 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Dec 2006 21:21:30 +0000 (21:21 +0000)
        Reviewed and landed by Alexey.

        http://bugs.webkit.org/show_bug.cgi?id=11759:
        Windows build bustage

WebCore:
        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * bridge/win/ContextMenuClientWin.h:
        * bridge/win/FrameWin.h:
        * loader/win/FrameLoaderWin.cpp:
        (WebCore::FrameLoader::submitForm):
        * platform/network/win/ResourceHandleWin.cpp:
        (WebCore::ResourceHandle::onRequestComplete):
        (WebCore::ResourceHandle::fileLoadTimer):
        (WebCore::ResourceHandle::cancel):
        * platform/win/MouseEventWin.cpp:
        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
        * platform/win/TemporaryLinkStubs.cpp:
        (WebCore::fileButtonChooseFileLabel):
        (WebCore::inputElementAltText):
        (WebCore::copyCursor):
        (WebCore::resetButtonDefaultLabel):
        (WebCore::ContextMenuClientWin::contextMenuItemSelected):
        (WebCore::ContextMenuClientWin::copyLinkToClipboard):
        (WebCore::ContextMenuClientWin::downloadURL):
        (WebCore::ContextMenuClientWin::copyImageToClipboard):
        (WebCore::Editor::ignoreSpelling):
        (WebCore::Editor::learnSpelling):
        (WebCore::Editor::isSelectionUngrammatical):
        (WebCore::Editor::isSelectionMisspelled):
        (WebCore::Editor::guessesForMisspelledSelection):
        (WebCore::Editor::guessesForUngrammaticalSelection):
        (WebCore::Editor::markMisspellingsInAdjacentWords):
        (WebCore::FrameLoader::load):
        (WebCore::FrameWin::scheduleClose):
        (WebCore::FrameWin::respondToChangedSelection):

WebKit:
        * COM/WebFrame.cpp:
        (WebFrame::loadDataSource):
        * COM/WebFrame.h:

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

WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/bridge/win/ContextMenuClientWin.h
WebCore/bridge/win/FrameWin.h
WebCore/loader/win/FrameLoaderWin.cpp
WebCore/platform/network/win/ResourceHandleWin.cpp
WebCore/platform/win/MouseEventWin.cpp
WebCore/platform/win/TemporaryLinkStubs.cpp
WebKit/COM/WebFrame.cpp
WebKit/COM/WebFrame.h
WebKit/ChangeLog

index 50c626c1fc99f52188f66be6fdb2ee879aa05462..57a6ed5364b33bb2f2e3b38dd0958957afdbb246 100644 (file)
@@ -1,3 +1,41 @@
+2006-12-08  Don Gibson  <dgibson77@gmail.com>
+
+        Reviewed and landed by Alexey.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11759:
+        Windows build bustage
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * bridge/win/ContextMenuClientWin.h:
+        * bridge/win/FrameWin.h:
+        * loader/win/FrameLoaderWin.cpp:
+        (WebCore::FrameLoader::submitForm):
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::onRequestComplete):
+        (WebCore::ResourceHandle::fileLoadTimer):
+        (WebCore::ResourceHandle::cancel):
+        * platform/win/MouseEventWin.cpp:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/win/TemporaryLinkStubs.cpp:
+        (WebCore::fileButtonChooseFileLabel):
+        (WebCore::inputElementAltText):
+        (WebCore::copyCursor):
+        (WebCore::resetButtonDefaultLabel):
+        (WebCore::ContextMenuClientWin::contextMenuItemSelected):
+        (WebCore::ContextMenuClientWin::copyLinkToClipboard):
+        (WebCore::ContextMenuClientWin::downloadURL):
+        (WebCore::ContextMenuClientWin::copyImageToClipboard):
+        (WebCore::Editor::ignoreSpelling):
+        (WebCore::Editor::learnSpelling):
+        (WebCore::Editor::isSelectionUngrammatical):
+        (WebCore::Editor::isSelectionMisspelled):
+        (WebCore::Editor::guessesForMisspelledSelection):
+        (WebCore::Editor::guessesForUngrammaticalSelection):
+        (WebCore::Editor::markMisspellingsInAdjacentWords):
+        (WebCore::FrameLoader::load):
+        (WebCore::FrameWin::scheduleClose):
+        (WebCore::FrameWin::respondToChangedSelection):
+
 2006-12-08  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Geoff.
index ddcb5977b4473f67decd11363b2f6a51d03206ea..1cfdb66cbf09867cc4efb63d1408b9cafc535736 100644 (file)
                                RelativePath="..\..\loader\LoaderFunctions.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\loader\MainResourceLoader.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\MainResourceLoader.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\NavigationAction.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\NavigationAction.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\NetscapePluginStreamLoader.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\NetscapePluginStreamLoader.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\loader\PluginDocument.cpp"
                                >
                                RelativePath="..\..\loader\ResourceLoader.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\loader\SubresourceLoader.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\SubresourceLoader.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\SubresourceLoaderClient.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\loader\TextDocument.cpp"
                                >
                                        RelativePath="..\..\platform\network\HTTPHeaderMap.h"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\platform\network\HTTPParsers.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\network\HTTPParsers.h"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\..\platform\network\ResourceError.cpp"
                                        >
index ef73331e1b7965dd6bb9db8c2ec156c17ae25686..ed3f9743b37ee7b65e28de3c69a083be9c504db2 100644 (file)
@@ -38,11 +38,11 @@ namespace WebCore {
         virtual void contextMenuDestroyed();
 
         virtual void addCustomContextMenuItems(ContextMenu*);
-        virtual void contextMenuItemSelected(ContextMenuItem*);
+        virtual void contextMenuItemSelected(const ContextMenuItem*);
 
-        virtual void copyLinkToClipboard(HitTestResult);
-        virtual void downloadURL(KURL);
-        virtual void copyImageToClipboard(HitTestResult);
+        virtual void copyLinkToClipboard(const HitTestResult&);
+        virtual void downloadURL(const KURL&);
+        virtual void copyImageToClipboard(const HitTestResult&);
         virtual void lookUpInDictionary(Frame*);
     };
 
index 8cea6d16cccecc8f14e2d8fe21fe74c459eab5ab..f9066ebb51a7dc074a2537a9297c76ca1bbb5ade 100644 (file)
@@ -64,12 +64,6 @@ namespace WebCore {
         virtual void unfocusWindow();
         virtual void print();
 
-        virtual void ignoreSpelling();
-        virtual void learnSpelling();
-        virtual bool isSelectionMisspelled();
-        virtual Vector<String> guessesForMisspelledSelection();
-        virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
-        virtual void markMisspellings(const Selection&);
         virtual Range* markedTextRange() const;
         virtual void issueCutCommand();
         virtual void issueCopyCommand();
index 300d5a6ad67da59cf411a4d277ca26424e3bb295..b5c59ad9a389a0efd861a95083b727acc1a62f55 100644 (file)
@@ -44,11 +44,14 @@ void FrameLoader::urlSelected(const FrameLoadRequest& request, Event* /*triggeri
 
 void FrameLoader::submitForm(const FrameLoadRequest& request, Event*)
 {
-    // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
     const ResourceRequest& resourceRequest = request.resourceRequest();
+
+#ifdef MULTIPLE_FORM_SUBMISSION_PROTECTION
+    // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
     if (m_submittedFormURL == resourceRequest.url())
         return;
     m_submittedFormURL = resourceRequest.url();
+#endif
 
     FrameWin* frameWin = static_cast<FrameWin*>(m_frame);
     if (frameWin->client())
index d2f9c0119624aa2eb3d9faaf230b0a0a58323400..ca6f8b9c3660fa69350b9642d88e2b7073802283 100644 (file)
@@ -236,9 +236,10 @@ void ResourceHandle::onRequestComplete(LPARAM lParam)
     while ((ok = InternetReadFileExA(handle, &buffers, IRF_NO_WAIT, (DWORD_PTR)this)) && buffers.dwBufferLength) {
         if (!hasReceivedResponse()) {
             setHasReceivedResponse();
-            client()->receivedResponse(this, 0);
+            ResourceResponse response;
+            client()->didReceiveResponse(this, response);
         }
-        client()->didReceiveData(this, buffer, buffers.dwBufferLength);
+        client()->didReceiveData(this, buffer, buffers.dwBufferLength, 0);
         buffers.dwBufferLength = bufferSize;
     }
 
@@ -265,7 +266,6 @@ void ResourceHandle::onRequestComplete(LPARAM lParam)
         InternetCloseHandle(d->m_secondaryHandle);
     InternetCloseHandle(d->m_resourceHandle);
 
-    client()->receivedAllData(this, &platformData);
     client()->didFinishLoading(this);
     delete this;
 }
@@ -405,7 +405,8 @@ bool ResourceHandle::start(DocLoader* docLoader)
 
 void ResourceHandle::fileLoadTimer(Timer<ResourceHandle>* timer)
 {
-    client()->receivedResponse(this, 0);
+    ResourceResponse response;
+    client()->didReceiveResponse(this, response);
 
     bool result = false;
     DWORD bytesRead = 0;
@@ -415,7 +416,7 @@ void ResourceHandle::fileLoadTimer(Timer<ResourceHandle>* timer)
         char buffer[bufferSize];
         result = ReadFile(d->m_fileHandle, &buffer, bufferSize, &bytesRead, NULL); 
         if (result && bytesRead)
-            client()->didReceiveData(this, buffer, bytesRead);
+            client()->didReceiveData(this, buffer, bytesRead, 0);
         // Check for end of file. 
     } while (result && bytesRead);
 
@@ -424,12 +425,6 @@ void ResourceHandle::fileLoadTimer(Timer<ResourceHandle>* timer)
     CloseHandle(d->m_fileHandle);
     d->m_fileHandle = INVALID_HANDLE_VALUE;
 
-    PlatformDataStruct platformData;
-    platformData.errorString = 0;
-    platformData.error = 0;
-    platformData.loaded = TRUE;
-
-    client()->receivedAllData(this, &platformData);
     client()->didFinishLoading(this);
 }
 
@@ -440,18 +435,12 @@ void ResourceHandle::cancel()
     else
         d->m_fileLoadTimer.stop();
 
-    PlatformDataStruct platformData;
-    platformData.errorString = 0;
-    platformData.error = 0;
-    platformData.loaded = FALSE;
-
-    client()->receivedAllData(this, &platformData);
     client()->didFinishLoading(this); 
 
     if (!d->m_resourceHandle)
         // Async load canceled before we have a handle -- mark ourselves as in error, to be deleted later.
         // FIXME: need real cancel error
-        client()->didFailWithError(this, ResourceError());
+        client()->didFail(this, ResourceError());
 }
 
 void ResourceHandle::setHasReceivedResponse(bool b)
index 7f1ba1598586dd0d24dfe0de894e6ab4de21dab3..06bbc20259531887ab355f14639e7b2adbc1ada5 100644 (file)
@@ -51,13 +51,14 @@ static IntPoint globalPositionForEvent(HWND hWnd, LPARAM lParam)
     return point;
 }
 
-PlatformMouseEvent::PlatformMouseEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+PlatformMouseEvent::PlatformMouseEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, bool activatedWebView)
     : m_position(positionForEvent(hWnd, lParam))
     , m_globalPosition(globalPositionForEvent(hWnd, lParam))
     , m_shiftKey(wParam & MK_SHIFT)
     , m_ctrlKey(wParam & MK_CONTROL)
     , m_altKey(GetKeyState(VK_MENU) & HIGH_BIT_MASK_SHORT)
     , m_metaKey(m_altKey) // FIXME: We'll have to test other browsers
+    , m_activatedWebView(activatedWebView)
 {
     switch (message) {
         case WM_LBUTTONDOWN:
index 9af45b85344b0d0e0fb412893fbe726701f6b84e..9553e531bd2e6e6604aaace78dd5e50087bcbdc7 100644 (file)
@@ -72,6 +72,7 @@
 #include "PlatformScrollBar.h"
 #include "PlugInInfoStore.h"
 #include "PopupMenu.h"
+#include "Range.h"
 #include "RenderTheme.h"
 #include "ResourceLoader.h"
 #include "RenderThemeWin.h"
@@ -92,12 +93,10 @@ namespace WebCore {
 static int frameNumber = 0;
 static Cursor localCursor;
 
-time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse) { notImplemented(); return 0; }
 void CheckCacheObjectStatus(DocLoader*, CachedResource*) { notImplemented(); }
 bool CheckIfReloading(DocLoader*) { notImplemented(); return false; }
 String defaultLanguage() { notImplemented(); return "en"; }
 String fileButtonChooseFileLabel() { notImplemented(); return "Browse..."; }
-String fileButtonNoFileSelectedLabel() { notImplemented(); return String(); }
 int findNextSentenceFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
 int findNextWordFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
 void findSentenceBoundary(UChar const*, int, int, int*, int*) { notImplemented(); }
@@ -105,19 +104,16 @@ void findWordBoundary(UChar const* str, int len, int position, int* start, int*
 Color focusRingColor() { notImplemented(); return 0xFF0000FF; }
 bool historyContains(DeprecatedString const&) { notImplemented(); return false; }
 String inputElementAltText() { notImplemented(); return DeprecatedString(); }
-bool IsResponseURLEqualToURL(PlatformResponse , const String&) { notImplemented(); return false; }
 const Cursor& aliasCursor() { notImplemented(); return localCursor; }
 const Cursor& cellCursor() { notImplemented(); return localCursor; }
 const Cursor& contextMenuCursor() { notImplemented(); return localCursor; }
+const Cursor& copyCursor() { notImplemented(); return localCursor; }
 const Cursor& moveCursor() { notImplemented(); return localCursor; }
 const Cursor& noDropCursor() { notImplemented(); return localCursor; }
 const Cursor& progressCursor() { notImplemented(); return localCursor; }
 const Cursor& verticalTextCursor() { notImplemented(); return localCursor; }
 void refreshPlugins(bool) { notImplemented(); }
 String resetButtonDefaultLabel() { notImplemented(); return "Reset"; }
-bool ResponseIsMultipart(PlatformResponse) { notImplemented(); return false; }
-DeprecatedString ResponseMIMEType(PlatformResponse) { notImplemented(); return DeprecatedString(); }
-DeprecatedString ResponseURL(PlatformResponse) { notImplemented(); return DeprecatedString(); }
 int screenDepthPerComponent(Widget*) { notImplemented(); return 8; }
 bool screenIsMonochrome(Widget*) { notImplemented(); return false; }
 String searchableIndexIntroduction() { notImplemented(); return String(); }
@@ -159,10 +155,10 @@ void ContextMenu::show() { notImplemented(); }
 
 void ContextMenuClientWin::contextMenuDestroyed() { notImplemented(); }
 void ContextMenuClientWin::addCustomContextMenuItems(ContextMenu*) { notImplemented(); }
-void ContextMenuClientWin::contextMenuItemSelected(ContextMenuItem*) { notImplemented(); }
-void ContextMenuClientWin::copyLinkToClipboard(HitTestResult) { notImplemented(); }
-void ContextMenuClientWin::downloadURL(KURL) { notImplemented(); }
-void ContextMenuClientWin::copyImageToClipboard(HitTestResult) { notImplemented(); }
+void ContextMenuClientWin::contextMenuItemSelected(const ContextMenuItem*) { notImplemented(); }
+void ContextMenuClientWin::copyLinkToClipboard(const HitTestResult&) { notImplemented(); }
+void ContextMenuClientWin::downloadURL(const KURL& url) { notImplemented(); }
+void ContextMenuClientWin::copyImageToClipboard(const HitTestResult&) { notImplemented(); }
 void ContextMenuClientWin::lookUpInDictionary(Frame*) { notImplemented(); }
 
 ContextMenuItem::ContextMenuItem(PlatformMenuItemDescription, ContextMenu*) { notImplemented(); }
@@ -188,6 +184,13 @@ void DocumentLoader::setupForReplaceByMIMEType(const String& newMIMEType) { notI
 bool DocumentLoader::isLoadingInAPISense() const { notImplemented(); return false; }
 void DocumentLoader::stopRecordingResponses() { notImplemented(); }
 
+void Editor::ignoreSpelling() { notImplemented(); }
+void Editor::learnSpelling() { notImplemented(); }
+bool Editor::isSelectionUngrammatical() { notImplemented(); return false; }
+bool Editor::isSelectionMisspelled() { notImplemented(); return false; }
+Vector<String> Editor::guessesForMisspelledSelection() { notImplemented(); return Vector<String>(); }
+Vector<String> Editor::guessesForUngrammaticalSelection() { notImplemented(); return Vector<String>(); }
+void Editor::markMisspellingsInAdjacentWords(const VisiblePosition&) { notImplemented(); }
 PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy) { notImplemented(); return 0; }
 
 void EditorClientWin::pageDestroyed() { notImplemented(); }
@@ -236,6 +239,7 @@ void FileChooser::chooseFile(const String& filename) { notImplemented(); }
 
 void Frame::setNeedsReapplyStyles() { notImplemented(); }
 
+void FrameLoader::load(const FrameLoadRequest&, bool userGesture, Event*, Element* form, const HashMap<String, String>& formValues) { notImplemented(); }
 void FrameLoader::didFirstLayout() { notImplemented(); }
 String FrameLoader::overrideMediaType() const { notImplemented(); return String(); }
 Widget* FrameLoader::createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>&) { notImplemented(); return 0; }
@@ -345,18 +349,12 @@ void FrameWin::issueCopyCommand() { notImplemented(); }
 String FrameWin::mimeTypeForFileName(String const&) const { notImplemented(); return String(); }
 void FrameWin::issuePasteCommand() { notImplemented(); }
 void FrameWin::scheduleClose() { notImplemented(); }
-void FrameWin::markMisspellings(const WebCore::Selection&) { notImplemented(); }
 void FrameWin::issueTransposeCommand() { notImplemented(); }
 void FrameWin::issuePasteAndMatchStyleCommand() { notImplemented(); }
 bool FrameWin::isLoadTypeReload() { notImplemented(); return false; }
 Range* FrameWin::markedTextRange() const { notImplemented(); return 0; }
 bool FrameWin::shouldChangeSelection(const Selection&, const Selection&, EAffinity, bool) const { notImplemented(); return true; }
 void FrameWin::respondToChangedSelection(const Selection&, bool) { notImplemented(); }
-void FrameWin::markMisspellingsInAdjacentWords(VisiblePosition const&) { notImplemented(); }
-void FrameWin::ignoreSpelling() { notImplemented(); }
-void FrameWin::learnSpelling() { notImplemented(); }
-bool FrameWin::isSelectionMisspelled() { notImplemented(); return false; }
-Vector<String> FrameWin::guessesForMisspelledSelection() { notImplemented(); return Vector<String>(); }
 
 void GraphicsContext::addRoundedRectClip(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight) { notImplemented(); }
 void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect, int thickness) { notImplemented(); }
index 4405a0f4a6f7baed35c87fec4f319816b34d2d97..77fedafdce15af3f120b88be8c0786ba3e7b4f76 100644 (file)
@@ -51,6 +51,7 @@
 #include "ResourceHandle.h"
 #include "ResourceHandleWin.h"
 #include "ResourceRequest.h"
+#include "SubresourceLoader.h"
 #pragma warning(pop)
 
 using namespace WebCore;
@@ -384,7 +385,7 @@ HRESULT WebFrame::loadDataSource(WebDataSource* dataSource)
                 }
 
                 ResourceRequest resourceRequest(kurl);
-                RefPtr<ResourceHandle> loader = ResourceHandle::create(resourceRequest, this, d->frame->document()->docLoader());
+                RefPtr<SubresourceLoader> loader = SubresourceLoader::create(d->frame.get(), this, resourceRequest);
 
                 IWebFrameLoadDelegate* frameLoadDelegate;
                 if (SUCCEEDED(d->webView->frameLoadDelegate(&frameLoadDelegate))) {
@@ -473,74 +474,6 @@ void WebFrame::didReceiveData(WebCore::ResourceHandle*, const char* data, int le
     d->frame->loader()->write(data, length);
 }
 
-void WebFrame::receivedResponse(ResourceHandle* job, PlatformResponse)
-{
-    // Commit the provisional data source
-
-    if (m_provisionalDataSource) {
-        m_dataSource = m_provisionalDataSource;
-        m_provisionalDataSource = 0;
-    }
-
-    // Tell the Frame to expect new data.  We use the URL of the data source in
-    // order to account for redirects.
-
-    IWebMutableURLRequest* request;
-    m_dataSource->request(&request);
-
-    BSTR url;
-    request->URL(&url);
-    request->Release();
-
-    KURL kurl(DeprecatedString((DeprecatedChar*)url, SysStringLen(url)));
-    SysFreeString(url);
-
-    // Update MIME info (FIXME: get from PlatformResponse)
-    d->frame->loader()->setResponseMIMEType(String(L"text/html"));
-
-    d->frame->loader()->begin(kurl);
-
-    if (m_loadType != WebFrameLoadTypeBack && m_loadType != WebFrameLoadTypeForward && m_loadType != WebFrameLoadTypeIndexedBackForward && !m_quickRedirectComing) {
-        DeprecatedString urlStr = job->url().url();
-        BSTR urlBStr = SysAllocStringLen((LPCOLESTR)urlStr.unicode(), urlStr.length());
-        WebHistoryItem* historyItem = WebHistoryItem::createInstance();
-        if (SUCCEEDED(historyItem->initWithURLString(urlBStr, 0/*FIXME*/))) {
-            IWebBackForwardList* backForwardList;
-            if (SUCCEEDED(d->webView->backForwardList(&backForwardList))) {
-                backForwardList->addItem(historyItem);
-                backForwardList->Release();
-            }
-            historyItem->Release();
-        }
-    }
-
-    IWebFrameLoadDelegate* frameLoadDelegate;
-    if (SUCCEEDED(d->webView->frameLoadDelegate(&frameLoadDelegate))) {
-        frameLoadDelegate->didCommitLoadForFrame(d->webView, this);
-        frameLoadDelegate->Release();
-    }
-}
-
-void WebFrame::receivedAllData(ResourceHandle*, PlatformData data)
-{
-    IWebFrameLoadDelegate* frameLoadDelegate;
-    if (SUCCEEDED(d->webView->frameLoadDelegate(&frameLoadDelegate))) {
-
-        if (data->loaded) {
-            frameLoadDelegate->didFinishLoadForFrame(d->webView, this);
-        }
-        else {
-            frameLoadDelegate->didFailLoadWithError(d->webView, 0/*FIXME*/, this);
-            m_quickRedirectComing = false;
-            m_loadType = WebFrameLoadTypeStandard;
-        }
-
-        frameLoadDelegate->Release();
-    }
-
-    d->frame->loader()->end();
-}
-
 // FrameWinClient
 
 void WebFrame::createNewWindow(const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, WebCore::Frame*& newFrame)
index 1de0c3822001610b3e084d843c00ab074dadb83a..55415c570e3af15d8fdad7ca395e4c3918e26939 100644 (file)
@@ -31,7 +31,7 @@
 #include "WebDataSource.h"
 
 #pragma warning(push, 0)
-#include "ResourceHandleClient.h"
+#include "SubresourceLoaderClient.h"
 #include "FrameWin.h"
 #include "PlatformString.h"
 #pragma warning(pop)
@@ -53,7 +53,7 @@ typedef enum {
     WebFrameLoadTypeReplace
 } WebFrameLoadType;
 
-class WebFrame : public IWebFrame, public WebCore::ResourceHandleClient, public WebCore::FrameWinClient
+class WebFrame : public IWebFrame, public WebCore::SubresourceLoaderClient, public WebCore::FrameWinClient
 {
 public:
     static WebFrame* createInstance();
@@ -132,8 +132,6 @@ public:
 
     // ResourceHandleClient
     virtual void didReceiveData(WebCore::ResourceHandle*, const char*, int);
-    virtual void receivedResponse(WebCore::ResourceHandle*, WebCore::PlatformResponse);
-    virtual void receivedAllData(WebCore::ResourceHandle*, WebCore::PlatformData);
 
     // FrameWinClient
     virtual void createNewWindow(const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, WebCore::Frame*& newFrame);
index 72af53954a84dc2af95548612b255e50839a6775..9835375d844103000e8939fb9a7d4ea275964d8a 100644 (file)
@@ -1,3 +1,14 @@
+2006-12-08  Don Gibson  <dgibson77@gmail.com>
+
+        Reviewed and landed by Alexey.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11759:
+        Windows build bustage
+
+        * COM/WebFrame.cpp:
+        (WebFrame::loadDataSource):
+        * COM/WebFrame.h:
+
 2006-12-08  David Harrison  <harrison@apple.com>
 
         Reviewed by Brady.