Skip to content

GitLab

T
tangled
Commit beff4db2 authored by lars's avatar lars
Browse files
Options

Make the Qt port compile again. 


git-svn-id: svn://svn.chromium.org/blink/trunk@18831 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 56b73483
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 29 deletions
third_party/WebKit/WebKitQt/ChangeLog
View file @ beff4db2
2007-01-13 Lars Knoll <lars@trolltech.com>
Compile again after yesterdays changes.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::assignIdentifierToInitialRequest):
(WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
(WebCore::FrameLoaderClientQt::dispatchDidReceiveAuthenticationChallenge):
(WebCore::FrameLoaderClientQt::dispatchDidCancelAuthenticationChallenge):
(WebCore::FrameLoaderClientQt::dispatchDidReceiveResponse):
(WebCore::FrameLoaderClientQt::dispatchDidReceiveContentLength):
(WebCore::FrameLoaderClientQt::dispatchDidFinishLoading):
(WebCore::FrameLoaderClientQt::dispatchDidFailLoading):
(WebCore::FrameLoaderClientQt::incrementProgress):
(WebCore::FrameLoaderClientQt::completeProgress):
* WebCoreSupport/FrameLoaderClientQt.h:
2007-01-11 Brady Eidson <beidson@apple.com>
Keep the fancy new FrameLoaderClientQt building with a small api change in WebCore
......
third_party/WebKit/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
View file @ beff4db2
......@@ -631,13 +631,28 @@ void FrameLoaderClientQt::download(WebCore::ResourceHandle*, const WebCore::Reso
notImplemented();
}
void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, void*, WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
void FrameLoaderClientQt::assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long, WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
{
// seems like the Mac code doesn't do anything here by default neither
qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().url();
}
void FrameLoaderClientQt::dispatchDidReceiveResponse(WebCore::DocumentLoader*, void*, const WebCore::ResourceResponse& response)
void FrameLoaderClientQt::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long, const WebCore::ResourceResponse& response)
{
m_response = response;
......@@ -645,17 +660,17 @@ void FrameLoaderClientQt::dispatchDidReceiveResponse(WebCore::DocumentLoader*, v
qDebug() << " got response from" << response.url().url();
}
void FrameLoaderClientQt::dispatchDidReceiveContentLength(WebCore::DocumentLoader*, void*, int)
void FrameLoaderClientQt::dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long, int)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidFinishLoading(WebCore::DocumentLoader*, void*)
void FrameLoaderClientQt::dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidFailLoading(WebCore::DocumentLoader*, void*, const WebCore::ResourceError&)
void FrameLoaderClientQt::dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long, const WebCore::ResourceError&)
{
notImplemented();
}
......@@ -709,17 +724,17 @@ void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::Resourc
notImplemented();
}
void FrameLoaderClientQt::incrementProgress(void*, const WebCore::ResourceResponse&)
void FrameLoaderClientQt::incrementProgress(unsigned long, const WebCore::ResourceResponse&)
{
notImplemented();
}
void FrameLoaderClientQt::incrementProgress(void*, const char*, int)
void FrameLoaderClientQt::incrementProgress(unsigned long, const char*, int)
{
notImplemented();
}
void FrameLoaderClientQt::completeProgress(void*)
void FrameLoaderClientQt::completeProgress(unsigned long)
{
notImplemented();
}
......@@ -735,16 +750,6 @@ bool FrameLoaderClientQt::willUseArchive(WebCore::ResourceLoader*, const WebCore
return false;
}
void FrameLoaderClientQt::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, id, const AuthenticationChallenge&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, id, const AuthenticationChallenge&)
{
notImplemented();
}
}
third_party/WebKit/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
View file @ beff4db2
......@@ -172,11 +172,17 @@ namespace WebCore {
virtual bool shouldFallBack(const WebCore::ResourceError&);
virtual WTF::PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&);
virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, void*, WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, void*, const WebCore::ResourceResponse&);
virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, void*, int);
virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, void*);
virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, void*, const WebCore::ResourceError&);
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&);
......@@ -185,14 +191,13 @@ namespace WebCore {
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 incrementProgress(void*, const WebCore::ResourceResponse&);
virtual void incrementProgress(void*, const char*, int);
virtual void completeProgress(void*);
virtual void incrementProgress(unsigned long, const WebCore::ResourceResponse&);
virtual void incrementProgress(unsigned long, const char*, int);
virtual void completeProgress(unsigned long);
virtual void startDownload(const WebCore::ResourceRequest&);
virtual bool willUseArchive(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, const WebCore::KURL&) const;
virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, id identifier, const AuthenticationChallenge&);
virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, id identifier, const AuthenticationChallenge&);
// FIXME: This should probably not be here, but it's needed for the tests currently
virtual void partClearedInBegin();
......
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