Skip to content

GitLab

T
tangled
Commit a7b8ca7b authored by andersca's avatar andersca
Browse files
Options

Rubber stamped by Adam. 

        
        Move even more code to .cpp files.

        * WebCore.xcodeproj/project.pbxproj:
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::createWindow):
        (WebCore::FrameLoader::load):
        (WebCore::FrameLoader::canLoad):
        (WebCore::FrameLoader::initialRequest):
        (WebCore::FrameLoader::receivedData):
        (WebCore::FrameLoader::setRequest):
        (WebCore::FrameLoader::setResponse):
        (WebCore::FrameLoader::willUseArchive):
        (WebCore::FrameLoader::handleUnimplementablePolicy):
        (WebCore::FrameLoader::cannotShowMIMEType):
        (WebCore::FrameLoader::interruptionForPolicyChangeError):
        (WebCore::FrameLoader::checkNavigationPolicy):
        (WebCore::FrameLoader::checkContentPolicy):
        (WebCore::FrameLoader::shouldReloadToHandleUnreachableURL):
        (WebCore::FrameLoader::reloadAllowingStaleData):
        (WebCore::FrameLoader::reload):
        (WebCore::FrameLoader::finishedLoading):
        (WebCore::FrameLoader::continueAfterWillSubmitForm):
        (WebCore::FrameLoader::submitForm):
        (WebCore::FrameLoader::post):
        (WebCore::FrameLoader::isReloading):
        (WebCore::FrameLoader::loadEmptyDocumentSynchronously):
        (WebCore::FrameLoader::loadResourceSynchronously):
        (WebCore::FrameLoader::startLoadingMainResource):
        (WebCore::FrameLoader::startLoading):
        (WebCore::FrameLoader::cancelMainResourceLoad):
        (WebCore::FrameLoader::identifierForInitialRequest):
        (WebCore::FrameLoader::willSendRequest):
        (WebCore::FrameLoader::didReceiveResponse):
        (WebCore::FrameLoader::didReceiveData):
        (WebCore::FrameLoader::didFailToLoad):
        (WebCore::FrameLoader::originalRequest):
        (WebCore::FrameLoader::receivedMainResourceError):
        (WebCore::FrameLoader::callContinueFragmentScrollAfterNavigationPolicy):
        (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
        (WebCore::FrameLoader::opened):
        (WebCore::FrameLoader::dataURLBaseFromRequest):
        (WebCore::FrameLoader::checkNewWindowPolicy):
        (WebCore::FrameLoader::continueAfterNewWindowPolicy):
        (WebCore::FrameLoader::continueAfterNavigationPolicy):
        (WebCore::FrameLoader::callContinueLoadAfterNavigationPolicy):
        (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
        (WebCore::FrameLoader::callContinueLoadAfterNewWindowPolicy):
        (WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
        (WebCore::FrameLoader::sendRemainingDelegateMessages):
        (WebCore::FrameLoader::requestFromDelegate):
        (WebCore::FrameLoader::loadedResourceFromMemoryCache):
        (WebCore::FrameLoader::applyUserAgent):
        (WebCore::PolicyCheck::PolicyCheck):
        (WebCore::PolicyCheck::clear):
        (WebCore::PolicyCheck::set):
        (WebCore::PolicyCheck::call):
        (WebCore::PolicyCheck::clearRequest):
        * loader/FrameLoader.h:
        * loader/FrameLoaderClient.h:
        * loader/MainResourceLoader.h:
        * loader/ResourceLoader.h:
        (WebCore::ResourceLoader::setIdentifier):
        (WebCore::ResourceLoader::identifier):
        * loader/mac/FrameLoaderMac.mm:
        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
        (WebCore::FrameLoader::referrer):
        (WebCore::FrameLoader::didReceiveAuthenticationChallenge):
        (WebCore::FrameLoader::didCancelAuthenticationChallenge):
        (WebCore::FrameLoader::didChangeTitle):
        * platform/graphics/svg/SVGImageEmptyClients.h:
        (WebCore::SVGEmptyFrameLoaderClient::dispatchCreatePage):



git-svn-id: svn://svn.chromium.org/blink/trunk@18635 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent fa49bdce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1071 additions and 995 deletions
third_party/WebKit/WebCore/ChangeLog
View file @ a7b8ca7b
2007-01-05 Anders Carlsson <acarlsson@apple.com>
Rubber stamped by Adam.
Move even more code to .cpp files.
* WebCore.xcodeproj/project.pbxproj:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::createWindow):
(WebCore::FrameLoader::load):
(WebCore::FrameLoader::canLoad):
(WebCore::FrameLoader::initialRequest):
(WebCore::FrameLoader::receivedData):
(WebCore::FrameLoader::setRequest):
(WebCore::FrameLoader::setResponse):
(WebCore::FrameLoader::willUseArchive):
(WebCore::FrameLoader::handleUnimplementablePolicy):
(WebCore::FrameLoader::cannotShowMIMEType):
(WebCore::FrameLoader::interruptionForPolicyChangeError):
(WebCore::FrameLoader::checkNavigationPolicy):
(WebCore::FrameLoader::checkContentPolicy):
(WebCore::FrameLoader::shouldReloadToHandleUnreachableURL):
(WebCore::FrameLoader::reloadAllowingStaleData):
(WebCore::FrameLoader::reload):
(WebCore::FrameLoader::finishedLoading):
(WebCore::FrameLoader::continueAfterWillSubmitForm):
(WebCore::FrameLoader::submitForm):
(WebCore::FrameLoader::post):
(WebCore::FrameLoader::isReloading):
(WebCore::FrameLoader::loadEmptyDocumentSynchronously):
(WebCore::FrameLoader::loadResourceSynchronously):
(WebCore::FrameLoader::startLoadingMainResource):
(WebCore::FrameLoader::startLoading):
(WebCore::FrameLoader::cancelMainResourceLoad):
(WebCore::FrameLoader::identifierForInitialRequest):
(WebCore::FrameLoader::willSendRequest):
(WebCore::FrameLoader::didReceiveResponse):
(WebCore::FrameLoader::didReceiveData):
(WebCore::FrameLoader::didFailToLoad):
(WebCore::FrameLoader::originalRequest):
(WebCore::FrameLoader::receivedMainResourceError):
(WebCore::FrameLoader::callContinueFragmentScrollAfterNavigationPolicy):
(WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
(WebCore::FrameLoader::opened):
(WebCore::FrameLoader::dataURLBaseFromRequest):
(WebCore::FrameLoader::checkNewWindowPolicy):
(WebCore::FrameLoader::continueAfterNewWindowPolicy):
(WebCore::FrameLoader::continueAfterNavigationPolicy):
(WebCore::FrameLoader::callContinueLoadAfterNavigationPolicy):
(WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
(WebCore::FrameLoader::callContinueLoadAfterNewWindowPolicy):
(WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
(WebCore::FrameLoader::sendRemainingDelegateMessages):
(WebCore::FrameLoader::requestFromDelegate):
(WebCore::FrameLoader::loadedResourceFromMemoryCache):
(WebCore::FrameLoader::applyUserAgent):
(WebCore::PolicyCheck::PolicyCheck):
(WebCore::PolicyCheck::clear):
(WebCore::PolicyCheck::set):
(WebCore::PolicyCheck::call):
(WebCore::PolicyCheck::clearRequest):
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:
* loader/MainResourceLoader.h:
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::setIdentifier):
(WebCore::ResourceLoader::identifier):
* loader/mac/FrameLoaderMac.mm:
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
(WebCore::FrameLoader::referrer):
(WebCore::FrameLoader::didReceiveAuthenticationChallenge):
(WebCore::FrameLoader::didCancelAuthenticationChallenge):
(WebCore::FrameLoader::didChangeTitle):
* platform/graphics/svg/SVGImageEmptyClients.h:
(WebCore::SVGEmptyFrameLoaderClient::dispatchCreatePage):
2007-01-05 Mitz Pettel <mitz@webkit.org> 2007-01-05 Mitz Pettel <mitz@webkit.org>
Reviewed by Hyatt. Reviewed by Hyatt.
......
third_party/WebKit/WebCore/WebCore.xcodeproj/project.pbxproj
View file @ a7b8ca7b
...@@ -4375,7 +4375,7 @@ ...@@ -4375,7 +4375,7 @@
932CA7C40AAA20D200AD1FAD /* TextCodecLatin1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecLatin1.cpp; sourceTree = "<group>"; }; 932CA7C40AAA20D200AD1FAD /* TextCodecLatin1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecLatin1.cpp; sourceTree = "<group>"; };
932CA83A0AAA667F00AD1FAD /* TextCodecUTF16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecUTF16.h; sourceTree = "<group>"; }; 932CA83A0AAA667F00AD1FAD /* TextCodecUTF16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecUTF16.h; sourceTree = "<group>"; };
932CA8470AAA66CB00AD1FAD /* TextCodecUTF16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecUTF16.cpp; sourceTree = "<group>"; }; 932CA8470AAA66CB00AD1FAD /* TextCodecUTF16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecUTF16.cpp; sourceTree = "<group>"; };
932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoader.cpp; sourceTree = "<group>"; }; 932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = FrameLoader.cpp; sourceTree = "<group>"; };
93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; }; 93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; };
93309D88099E64910056E581 /* AppendNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppendNodeCommand.h; sourceTree = "<group>"; }; 93309D88099E64910056E581 /* AppendNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppendNodeCommand.h; sourceTree = "<group>"; };
93309D89099E64910056E581 /* ApplyStyleCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplyStyleCommand.cpp; sourceTree = "<group>"; }; 93309D89099E64910056E581 /* ApplyStyleCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplyStyleCommand.cpp; sourceTree = "<group>"; };
third_party/WebKit/WebCore/loader/FrameLoader.h
View file @ a7b8ca7b
...@@ -56,6 +56,9 @@ class NSURLAuthenticationChallenge; ...@@ -56,6 +56,9 @@ class NSURLAuthenticationChallenge;
#endif // __OBJC__ #endif // __OBJC__
#else
// FIXME: Get rid of this once we don't use id in the loader
typedef void* id;
#endif // PLATFORM(MAC) #endif // PLATFORM(MAC)
namespace KJS { namespace KJS {
...@@ -180,8 +183,8 @@ namespace WebCore { ...@@ -180,8 +183,8 @@ namespace WebCore {
void stopLoadingSubresources(); void stopLoadingSubresources();
#if PLATFORM(MAC) #if PLATFORM(MAC)
void closeBridge(); void closeBridge();
void cancelMainResourceLoad(const ResourceError&);
#endif #endif
void cancelMainResourceLoad(const ResourceError&);
void stopAllLoaders(); void stopAllLoaders();
void cancelMainResourceLoad(); void cancelMainResourceLoad();
void cancelPendingArchiveLoad(ResourceLoader*); void cancelPendingArchiveLoad(ResourceLoader*);
...@@ -209,14 +212,14 @@ namespace WebCore { ...@@ -209,14 +212,14 @@ namespace WebCore {
FrameState state() const; FrameState state() const;
static double timeOfLastCompletedLoad(); static double timeOfLastCompletedLoad();
#if PLATFORM(MAC)
id identifierForInitialRequest(const ResourceRequest&); id identifierForInitialRequest(const ResourceRequest&);
void willSendRequest(ResourceLoader*, ResourceRequest&, const ResourceResponse& redirectResponse); void willSendRequest(ResourceLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
#if PLATFORM(MAC)
void didReceiveAuthenticationChallenge(ResourceLoader*, NSURLAuthenticationChallenge *); void didReceiveAuthenticationChallenge(ResourceLoader*, NSURLAuthenticationChallenge *);
void didCancelAuthenticationChallenge(ResourceLoader*, NSURLAuthenticationChallenge *); void didCancelAuthenticationChallenge(ResourceLoader*, NSURLAuthenticationChallenge *);
#endif
void didReceiveResponse(ResourceLoader*, const ResourceResponse&); void didReceiveResponse(ResourceLoader*, const ResourceResponse&);
void didReceiveData(ResourceLoader*, const char*, int, int lengthReceived); void didReceiveData(ResourceLoader*, const char*, int, int lengthReceived);
#endif
void didFinishLoad(ResourceLoader*); void didFinishLoad(ResourceLoader*);
void didFailToLoad(ResourceLoader*, const ResourceError&); void didFailToLoad(ResourceLoader*, const ResourceError&);
bool privateBrowsingEnabled() const; bool privateBrowsingEnabled() const;
...@@ -228,9 +231,7 @@ namespace WebCore { ...@@ -228,9 +231,7 @@ namespace WebCore {
void handleFallbackContent(); void handleFallbackContent();
bool isStopping() const; bool isStopping() const;
#if PLATFORM(MAC)
void setResponse(const ResourceResponse&); void setResponse(const ResourceResponse&);
#endif
void finishedLoading(); void finishedLoading();
KURL URL() const; KURL URL() const;
...@@ -239,10 +240,8 @@ namespace WebCore { ...@@ -239,10 +240,8 @@ namespace WebCore {
ResourceError fileDoesNotExistError(const ResourceResponse&) const; ResourceError fileDoesNotExistError(const ResourceResponse&) const;
bool willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL&) const; bool willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL&) const;
bool isArchiveLoadPending(ResourceLoader*) const; bool isArchiveLoadPending(ResourceLoader*) const;
#if PLATFORM(MAC)
void cannotShowMIMEType(const ResourceResponse&); void cannotShowMIMEType(const ResourceResponse&);
ResourceError interruptionForPolicyChangeError(const ResourceRequest&); ResourceError interruptionForPolicyChangeError(const ResourceRequest&);
#endif
bool isHostedByObjectElement() const; bool isHostedByObjectElement() const;
bool isLoadingMainFrame() const; bool isLoadingMainFrame() const;
...@@ -282,11 +281,9 @@ namespace WebCore { ...@@ -282,11 +281,9 @@ namespace WebCore {
bool isQuickRedirectComing() const; bool isQuickRedirectComing() const;
#if PLATFORM(MAC)
void sendRemainingDelegateMessages(id identifier, const ResourceResponse&, unsigned length, const ResourceError&); void sendRemainingDelegateMessages(id identifier, const ResourceResponse&, unsigned length, const ResourceError&);
void requestFromDelegate(ResourceRequest&, id& identifier, ResourceError&); void requestFromDelegate(ResourceRequest&, id& identifier, ResourceError&);
void loadedResourceFromMemoryCache(const ResourceRequest&, const ResourceResponse&, int length); void loadedResourceFromMemoryCache(const ResourceRequest&, const ResourceResponse&, int length);
#endif
void checkLoadComplete(); void checkLoadComplete();
void detachFromParent(); void detachFromParent();
...@@ -505,9 +502,7 @@ namespace WebCore { ...@@ -505,9 +502,7 @@ namespace WebCore {
// Also not cool. // Also not cool.
void startLoading(); void startLoading();
#if PLATFORM(MAC)
bool startLoadingMainResource(ResourceRequest&, id identifier); bool startLoadingMainResource(ResourceRequest&, id identifier);
#endif
void stopLoadingSubframes(); void stopLoadingSubframes();
void clearProvisionalLoad(); void clearProvisionalLoad();
...@@ -558,10 +553,8 @@ namespace WebCore { ...@@ -558,10 +553,8 @@ namespace WebCore {
void updateHistoryAfterClientRedirect(); void updateHistoryAfterClientRedirect();
bool shouldReloadToHandleUnreachableURL(const ResourceRequest&); bool shouldReloadToHandleUnreachableURL(const ResourceRequest&);
#if PLATFORM(MAC)
void handleUnimplementablePolicy(const ResourceError&); void handleUnimplementablePolicy(const ResourceError&);
#endif
void applyUserAgent(ResourceRequest& request); void applyUserAgent(ResourceRequest& request);
bool canTarget(Frame*) const; bool canTarget(Frame*) const;
......
third_party/WebKit/WebCore/loader/FrameLoaderClient.h
View file @ a7b8ca7b
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
class NSImage; class NSImage;
class NSURLConnection; class NSURLConnection;
#endif #endif
#else
// FIXME: Get rid of this once we don't use id in the loader
typedef void* id;
#endif #endif
namespace WebCore { namespace WebCore {
...@@ -86,19 +89,21 @@ namespace WebCore { ...@@ -86,19 +89,21 @@ namespace WebCore {
virtual void loadedFromPageCache() = 0; virtual void loadedFromPageCache() = 0;
#if PLATFORM(MAC)
virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceResponse&) = 0; virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceResponse&) = 0;
#if PLATFORM(MAC)
virtual id dispatchIdentifierForInitialRequest(DocumentLoader*, const ResourceRequest&) = 0; virtual id dispatchIdentifierForInitialRequest(DocumentLoader*, const ResourceRequest&) = 0;
#endif
virtual void dispatchWillSendRequest(DocumentLoader*, id identifier, ResourceRequest&, const ResourceResponse& redirectResponse) = 0; virtual void dispatchWillSendRequest(DocumentLoader*, id identifier, ResourceRequest&, const ResourceResponse& redirectResponse) = 0;
#if PLATFORM(MAC)
virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, id identifier, NSURLAuthenticationChallenge *) = 0; virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, id identifier, NSURLAuthenticationChallenge *) = 0;
virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, id identifier, NSURLAuthenticationChallenge *) = 0; virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, id identifier, NSURLAuthenticationChallenge *) = 0;
#endif
virtual void dispatchDidReceiveResponse(DocumentLoader*, id identifier, const ResourceResponse&) = 0; virtual void dispatchDidReceiveResponse(DocumentLoader*, id identifier, const ResourceResponse&) = 0;
virtual void dispatchDidReceiveContentLength(DocumentLoader*, id identifier, int lengthReceived) = 0; virtual void dispatchDidReceiveContentLength(DocumentLoader*, id identifier, int lengthReceived) = 0;
virtual void dispatchDidFinishLoading(DocumentLoader*, id identifier) = 0; virtual void dispatchDidFinishLoading(DocumentLoader*, id identifier) = 0;
virtual void dispatchDidFailLoading(DocumentLoader*, id identifier, const ResourceError&) = 0; virtual void dispatchDidFailLoading(DocumentLoader*, id identifier, const ResourceError&) = 0;
virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) = 0; virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) = 0;
#endif
virtual void dispatchDidHandleOnloadEvents() = 0; virtual void dispatchDidHandleOnloadEvents() = 0;
virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0; virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
...@@ -110,28 +115,20 @@ namespace WebCore { ...@@ -110,28 +115,20 @@ namespace WebCore {
virtual void dispatchDidStartProvisionalLoad() = 0; virtual void dispatchDidStartProvisionalLoad() = 0;
virtual void dispatchDidReceiveTitle(const String& title) = 0; virtual void dispatchDidReceiveTitle(const String& title) = 0;
virtual void dispatchDidCommitLoad() = 0; virtual void dispatchDidCommitLoad() = 0;
#if PLATFORM(MAC)
virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0; virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
virtual void dispatchDidFailLoad(const ResourceError&) = 0; virtual void dispatchDidFailLoad(const ResourceError&) = 0;
#endif
virtual void dispatchDidFinishLoad() = 0; virtual void dispatchDidFinishLoad() = 0;
virtual void dispatchDidFirstLayout() = 0; virtual void dispatchDidFirstLayout() = 0;
#if PLATFORM(MAC) virtual Frame* dispatchCreatePage() = 0;
virtual Frame* dispatchCreatePage(NSURLRequest *) = 0;
#endif
virtual void dispatchShow() = 0; virtual void dispatchShow() = 0;
#if PLATFORM(MAC)
virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String& MIMEType, const ResourceRequest&) = 0; virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String& MIMEType, const ResourceRequest&) = 0;
virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, const String& frameName) = 0; virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, const String& frameName) = 0;
virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&) = 0; virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&) = 0;
#endif
virtual void cancelPolicyCheck() = 0; virtual void cancelPolicyCheck() = 0;
#if PLATFORM(MAC)
virtual void dispatchUnableToImplementPolicy(const ResourceError&) = 0; virtual void dispatchUnableToImplementPolicy(const ResourceError&) = 0;
#endif
virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>) = 0; virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>) = 0;
...@@ -143,17 +140,13 @@ namespace WebCore { ...@@ -143,17 +140,13 @@ namespace WebCore {
virtual void progressStarted() = 0; virtual void progressStarted() = 0;
virtual void progressCompleted() = 0; virtual void progressCompleted() = 0;
#if PLATFORM(MAC)
virtual void incrementProgress(id identifier, const ResourceResponse&) = 0; virtual void incrementProgress(id identifier, const ResourceResponse&) = 0;
virtual void incrementProgress(id identifier, const char*, int) = 0; virtual void incrementProgress(id identifier, const char*, int) = 0;
virtual void completeProgress(id identifier) = 0; virtual void completeProgress(id identifier) = 0;
#endif
virtual void setMainFrameDocumentReady(bool) = 0; virtual void setMainFrameDocumentReady(bool) = 0;
#if PLATFORM(MAC)
virtual void startDownload(const ResourceRequest&) = 0; virtual void startDownload(const ResourceRequest&) = 0;
#endif
virtual void willChangeTitle(DocumentLoader*) = 0; virtual void willChangeTitle(DocumentLoader*) = 0;
virtual void didChangeTitle(DocumentLoader*) = 0; virtual void didChangeTitle(DocumentLoader*) = 0;
...@@ -177,9 +170,7 @@ namespace WebCore { ...@@ -177,9 +170,7 @@ namespace WebCore {
virtual void setDefersLoading(bool) = 0; virtual void setDefersLoading(bool) = 0;
#if PLATFORM(MAC)
virtual bool willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL& originalURL) const = 0; virtual bool willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL& originalURL) const = 0;
#endif
virtual bool isArchiveLoadPending(ResourceLoader*) const = 0; virtual bool isArchiveLoadPending(ResourceLoader*) const = 0;
virtual void cancelPendingArchiveLoad(ResourceLoader*) = 0; virtual void cancelPendingArchiveLoad(ResourceLoader*) = 0;
virtual void clearArchivedResources() = 0; virtual void clearArchivedResources() = 0;
......
third_party/WebKit/WebCore/loader/MainResourceLoader.h
View file @ a7b8ca7b
...@@ -40,10 +40,8 @@ namespace WebCore { ...@@ -40,10 +40,8 @@ namespace WebCore {
static PassRefPtr<MainResourceLoader> create(Frame*); static PassRefPtr<MainResourceLoader> create(Frame*);
virtual ~MainResourceLoader(); virtual ~MainResourceLoader();
#if PLATFORM(MAC)
virtual bool load(const ResourceRequest&); virtual bool load(const ResourceRequest&);
virtual void addData(const char*, int, bool allAtOnce); virtual void addData(const char*, int, bool allAtOnce);
#endif
virtual void setDefersLoading(bool); virtual void setDefersLoading(bool);
......
third_party/WebKit/WebCore/loader/ResourceLoader.h
View file @ a7b8ca7b
...@@ -52,6 +52,9 @@ class NSURLAuthenticationChallenge; ...@@ -52,6 +52,9 @@ class NSURLAuthenticationChallenge;
class NSURLCredential; class NSURLCredential;
#endif #endif
#else
// FIXME: Get rid of this once we don't use id in the loader
typedef void* id;
#endif #endif
namespace WebCore { namespace WebCore {
...@@ -67,26 +70,27 @@ namespace WebCore { ...@@ -67,26 +70,27 @@ namespace WebCore {
void cancel(); void cancel();
#if PLATFORM(MAC)
virtual bool load(const ResourceRequest&); virtual bool load(const ResourceRequest&);
FrameLoader *frameLoader() const; FrameLoader *frameLoader() const;
virtual void cancel(const ResourceError&); virtual void cancel(const ResourceError&);
ResourceError cancelledError(); ResourceError cancelledError();
#endif
virtual void setDefersLoading(bool); virtual void setDefersLoading(bool);
#if PLATFORM(MAC) #if PLATFORM(MAC)
void setIdentifier(id); void setIdentifier(id);
id identifier() const { return m_identifier.get(); } id identifier() const { return m_identifier.get(); }
#else
void setIdentifier(id) { }
id identifier() const { return 0; }
#endif
virtual void releaseResources(); virtual void releaseResources();
const ResourceResponse& response() const; const ResourceResponse& response() const;
virtual void addData(const char*, int, bool allAtOnce); virtual void addData(const char*, int, bool allAtOnce);
#endif
virtual PassRefPtr<SharedBuffer> resourceData(); virtual PassRefPtr<SharedBuffer> resourceData();
void clearResourceData(); void clearResourceData();
......
third_party/WebKit/WebCore/platform/graphics/svg/SVGImageEmptyClients.h
View file @ a7b8ca7b
...@@ -170,7 +170,7 @@ public: ...@@ -170,7 +170,7 @@ public:
virtual void dispatchDidFirstLayout() { } virtual void dispatchDidFirstLayout() { }
#if PLATFORM(MAC) #if PLATFORM(MAC)
virtual Frame* dispatchCreatePage(NSURLRequest *) { return 0; } virtual Frame* dispatchCreatePage() { return 0; }
#endif #endif
virtual void dispatchShow() { } virtual void dispatchShow() { }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment