Skip to content

GitLab

T
tangled
Commit a1433d71 authored by staikos's avatar staikos
Browse files
Options

Make it compile and link again. (Qt) Includes implementation of a few stubs 

which should be moved to other locations, as well as a non-Qt-specific change
to make it compile (nil->ResourceResponse()).  Qt port continues to function as
well as before.


git-svn-id: svn://svn.chromium.org/blink/trunk@18650 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 8be4672d
Hide whitespace changes
Inline Side-by-side
Showing with 348 additions and 483 deletions
third_party/WebKit/WebCore/ChangeLog
View file @ a1433d71
2007-01-06 George Staikos <staikos@kde.org>
Reviewed by Brady.
Make the Qt build work.... again.
* WebCore.pro:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::requestFromDelegate):
* loader/qt/DocumentLoaderQt.cpp:
* loader/qt/FrameLoaderQt.cpp:
* loader/qt/MainResourceLoaderQt.cpp: Added.
(WebCore::MainResourceLoader::create):
* loader/qt/ResourceLoaderQt.cpp:
(WebCore::ResourceLoader::load):
(WebCore::ResourceLoader::cancel):
(WebCore::ResourceLoader::releaseResources):
(WebCore::ResourceLoader::addData):
* platform/network/qt/ResourceHandleQt.cpp:
(WebCore::ResourceHandle::supportsBufferedData):
(WebCore::ResourceHandle::bufferedData):
(WebCore::ResourceHandle::loadResourceSynchronously):
* platform/qt/LoaderFunctionsQt.cpp:
* platform/qt/TemporaryLinkStubs.cpp: implemented some functions
(WebCore::screenDepth):
(WebCore::screenDepthPerComponent):
(WebCore::screenIsMonochrome):
(WebCore::screenRect):
(WebCore::screenAvailableRect):
2007-01-07 Mitz Pettel <mitz@webkit.org> 2007-01-07 Mitz Pettel <mitz@webkit.org>
Reviewed by Mark Rowe. Reviewed by Mark Rowe.
......
third_party/WebKit/WebCore/WebCore.pro
View file @ a1433d71
...@@ -506,6 +506,7 @@ SOURCES += \ ...@@ -506,6 +506,7 @@ SOURCES += \
loader/qt/DocumentLoaderQt.cpp \ loader/qt/DocumentLoaderQt.cpp \
loader/qt/NavigationActionQt.cpp \ loader/qt/NavigationActionQt.cpp \
loader/qt/ResourceLoaderQt.cpp \ loader/qt/ResourceLoaderQt.cpp \
loader/qt/MainResourceLoaderQt.cpp \
platform/CString.cpp \ platform/CString.cpp \
platform/AtomicString.cpp \ platform/AtomicString.cpp \
platform/Base64.cpp \ platform/Base64.cpp \
...@@ -530,6 +531,7 @@ SOURCES += \ ...@@ -530,6 +531,7 @@ SOURCES += \
platform/qt/TextCodecQt.cpp \ platform/qt/TextCodecQt.cpp \
platform/DeprecatedString.cpp \ platform/DeprecatedString.cpp \
platform/DeprecatedCString.cpp \ platform/DeprecatedCString.cpp \
platform/SharedBuffer.cpp \
platform/qt/TextBreakIteratorQt.cpp \ platform/qt/TextBreakIteratorQt.cpp \
platform/TextCodecLatin1.cpp \ platform/TextCodecLatin1.cpp \
platform/TextCodecUTF16.cpp \ platform/TextCodecUTF16.cpp \
......
third_party/WebKit/WebCore/loader/FrameLoader.cpp
View file @ a1433d71
...@@ -3357,7 +3357,7 @@ void FrameLoader::requestFromDelegate(ResourceRequest& request, id& identifier, ...@@ -3357,7 +3357,7 @@ void FrameLoader::requestFromDelegate(ResourceRequest& request, id& identifier,
identifier = 0; identifier = 0;
#endif #endif
ResourceRequest newRequest(request); ResourceRequest newRequest(request);
m_client->dispatchWillSendRequest(m_documentLoader.get(), identifier, newRequest, nil); m_client->dispatchWillSendRequest(m_documentLoader.get(), identifier, newRequest, ResourceResponse());
if (newRequest.isNull()) if (newRequest.isNull())
error = m_client->cancelledError(request); error = m_client->cancelledError(request);
......
third_party/WebKit/WebCore/loader/qt/DocumentLoaderQt.cpp
View file @ a1433d71
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "FrameLoader.h" #include "FrameLoader.h"
#include "FrameQt.h" #include "FrameQt.h"
#include "PlatformString.h" #include "PlatformString.h"
#include "SharedBuffer.h"
#include "XMLTokenizer.h" #include "XMLTokenizer.h"
#include <wtf/Assertions.h> #include <wtf/Assertions.h>
...@@ -42,116 +43,6 @@ ...@@ -42,116 +43,6 @@
namespace WebCore { namespace WebCore {
/*
* Performs three operations:
* 1. Convert backslashes to currency symbols
* 2. Convert control characters to spaces
* 3. Trim leading and trailing spaces
*/
static inline String canonicalizedTitle(const String& title, Frame* frame)
{
ASSERT(!title.isEmpty());
const UChar* characters = title.characters();
unsigned length = title.length();
unsigned i;
// Find the first non-canonical character
for (i = 0; i < length; ++i) {
UChar c = characters[i];
if (c < 0x20 || c == 0x7F || c == '\\')
break;
}
// Optimization for titles that have no non-canonical characters and no leading or trailing spaces
if (i == length && characters[0] != ' ' && characters[length - 1] != ' ')
return title;
Vector<UChar> stringBuilder(length);
unsigned builderIndex = 0;
// Skip leading spaces and leading characters that would convert to spaces
for (i = 0; i < length; ++i) {
UChar c = characters[i];
if (!(c <= 0x20 || c == 0x7F))
break;
}
// Replace control characters with spaces, and backslashes with currency symbols
for (; i < length; ++i) {
UChar c = characters[i];
if (c < 0x20 || c == 0x7F)
c = ' ';
else if (c == '\\')
c = frame->backslashAsCurrencySymbol();
stringBuilder[builderIndex++] = c;
}
// Strip trailing spaces
while (builderIndex > 0) {
--builderIndex;
if (stringBuilder[builderIndex] != ' ')
break;
}
if (builderIndex == 0 && stringBuilder[builderIndex] == ' ')
return "";
stringBuilder.resize(builderIndex + 1);
return String::adopt(stringBuilder);
}
FrameLoader* DocumentLoader::frameLoader() const
{
if (!m_frame)
return 0;
return m_frame->loader();
}
DocumentLoader::~DocumentLoader()
{
ASSERT(!m_frame || frameLoader()->activeDocumentLoader() != this ||
!frameLoader()->isLoading());
}
const ResourceRequest& DocumentLoader::originalRequest() const
{
return m_originalRequest;
}
const ResourceRequest& DocumentLoader::originalRequestCopy() const
{
return m_originalRequestCopy;
}
const ResourceRequest& DocumentLoader::request() const
{
// FIXME: need a better way to handle data loads
return m_request;
}
ResourceRequest& DocumentLoader::request()
{
// FIXME: need a better way to handle data loads
return m_request;
}
const ResourceRequest& DocumentLoader::initialRequest() const
{
// FIXME: need a better way to handle data loads
return m_originalRequest;
}
ResourceRequest& DocumentLoader::actualRequest()
{
return m_request;
}
const KURL& DocumentLoader::URL() const
{
return request().url();
}
const KURL DocumentLoader::unreachableURL() const const KURL DocumentLoader::unreachableURL() const
{ {
KURL url; KURL url;
...@@ -159,265 +50,10 @@ const KURL DocumentLoader::unreachableURL() const ...@@ -159,265 +50,10 @@ const KURL DocumentLoader::unreachableURL() const
return url; return url;
} }
void DocumentLoader::replaceRequestURLForAnchorScroll(const KURL& URL)
{
notImplemented();
}
void DocumentLoader::clearErrors()
{
}
// Cancels the data source's pending loads. Conceptually, a data source only loads
// one document at a time, but one document may have many related resources.
// stopLoading will stop all loads initiated by the data source,
// but not loads initiated by child frames' data sources -- that's the WebFrame's job.
void DocumentLoader::stopLoading()
{
// Always attempt to stop the frame because it may still be loading/parsing after the data source
// is done loading and not stopping it can cause a world leak.
if (m_committed)
m_frame->loader()->stopLoading(false);
if (!m_loading)
return;
RefPtr<Frame> protectFrame(m_frame);
RefPtr<DocumentLoader> protectLoader(this);
m_isStopping = true;
FrameLoader* frameLoader = DocumentLoader::frameLoader();
if (frameLoader->hasMainResourceLoader())
// Stop the main resource loader and let it send the cancelled message.
frameLoader->cancelMainResourceLoad();
//else if (frameLoader->isLoadingSubresources())
// The main resource loader already finished loading. Set the cancelled error on the
// document and let the subresourceLoaders send individual cancelled messages below.
//setMainDocumentError(frameLoader->cancelledError(m_request.get()));
//else
// If there are no resource loaders, we need to manufacture a cancelled message.
// (A back/forward navigation has no resource loaders because its resources are cached.)
//mainReceivedError(frameLoader->cancelledError(m_request.get()), true);
frameLoader->stopLoadingSubresources();
frameLoader->stopLoadingPlugIns();
m_isStopping = false;
}
void DocumentLoader::setupForReplace()
{
frameLoader()->setupForReplace();
m_committed = false;
}
void DocumentLoader::commitIfReady()
{
notImplemented();
if (m_gotFirstByte && !m_committed) {
m_committed = true;
//frameLoader()->commitProvisionalLoad(0);
}
}
void DocumentLoader::finishedLoading()
{
m_gotFirstByte = true;
commitIfReady();
frameLoader()->finishedLoadingDocument(this);
m_frame->loader()->end();
}
void DocumentLoader::setCommitted(bool f)
{
m_committed = f;
}
bool DocumentLoader::isCommitted() const
{
return m_committed;
}
void DocumentLoader::setLoading(bool f)
{
m_loading = f;
}
bool DocumentLoader::isLoading() const
{
return m_loading;
}
bool DocumentLoader::doesProgressiveLoad(const String& MIMEType) const
{
return !frameLoader()->isReplacing() || MIMEType == "text/html";
}
void DocumentLoader::setupForReplaceByMIMEType(const String& newMIMEType)
{
if (!m_gotFirstByte)
return;
//String oldMIMEType = [m_response.get() MIMEType];
//FIXME: get the mimetype correctly (then remove notImplemented())
notImplemented();
String oldMIMEType;
if (!doesProgressiveLoad(oldMIMEType)) {
frameLoader()->revertToProvisional(this);
setupForReplace();
}
frameLoader()->finishedLoadingDocument(this);
m_frame->loader()->end();
frameLoader()->setReplacing();
m_gotFirstByte = false;
if (doesProgressiveLoad(newMIMEType)) {
frameLoader()->revertToProvisional(this);
setupForReplace();
}
frameLoader()->stopLoadingSubresources();
frameLoader()->stopLoadingPlugIns();
frameLoader()->finalSetupForReplace(this);
}
void DocumentLoader::updateLoading()
{
ASSERT(this == frameLoader()->activeDocumentLoader());
setLoading(frameLoader()->isLoading());
}
void DocumentLoader::setFrame(Frame* frame)
{
if (m_frame == frame)
return;
ASSERT(frame && !m_frame);
m_frame = frame;
attachToFrame();
}
void DocumentLoader::attachToFrame()
{
ASSERT(m_frame);
}
void DocumentLoader::detachFromFrame()
{
ASSERT(m_frame);
m_frame = 0;
}
void DocumentLoader::prepareForLoadStart()
{
ASSERT(!m_isStopping);
setPrimaryLoadComplete(false);
ASSERT(frameLoader());
clearErrors();
setLoading(true);
frameLoader()->prepareForLoadStart();
}
void DocumentLoader::setIsClientRedirect(bool flag)
{
m_isClientRedirect = flag;
}
bool DocumentLoader::isClientRedirect() const
{
return m_isClientRedirect;
}
void DocumentLoader::setPrimaryLoadComplete(bool flag)
{
m_primaryLoadComplete = flag;
notImplemented();
if (flag) {
//if (frameLoader()->hasMainResourceLoader()) {
// setMainResourceData(frameLoader()->mainResourceData());
// frameLoader()->releaseMainResourceLoader();
//}
updateLoading();
}
}
bool DocumentLoader::isLoadingInAPISense() const
{
// Once a frame has loaded, we no longer need to consider subresources,
// but we still need to consider subframes.
if (frameLoader()->state() != FrameStateComplete) {
if (!m_primaryLoadComplete && isLoading())
return true;
if (frameLoader()->isLoadingSubresources())
return true;
if (Document* doc = m_frame->document())
if (Tokenizer* tok = doc->tokenizer())
if (tok->processingData())
return true;
}
return frameLoader()->subframeIsLoading();
}
void DocumentLoader::stopRecordingResponses()
{
notImplemented();
}
String DocumentLoader::title() const
{
return m_pageTitle;
}
const NavigationAction& DocumentLoader::triggeringAction() const
{
return m_triggeringAction;
}
void DocumentLoader::setTriggeringAction(const NavigationAction& action)
{
m_triggeringAction = action;
}
void DocumentLoader::setOverrideEncoding(const String& enc)
{
m_overrideEncoding = enc;
}
String DocumentLoader::overrideEncoding() const
{
return m_overrideEncoding;
}
void DocumentLoader::setTitle(const String& title)
{
if (title.isEmpty())
return;
String trimmed = canonicalizedTitle(title, m_frame);
if (!trimmed.isEmpty() && m_pageTitle != trimmed) {
frameLoader()->willChangeTitle(this);
m_pageTitle = trimmed;
frameLoader()->didChangeTitle(this);
}
}
bool DocumentLoader::getResponseRefreshAndModifiedHeaders(WebCore::String&, WebCore::String&) const bool DocumentLoader::getResponseRefreshAndModifiedHeaders(WebCore::String&, WebCore::String&) const
{ {
notImplemented(); notImplemented();
} }
KURL DocumentLoader::urlForHistory() const
{
notImplemented();
return KURL();
}
} }
third_party/WebKit/WebCore/loader/qt/FrameLoaderQt.cpp
View file @ a1433d71
...@@ -256,109 +256,6 @@ void FrameLoader::redirectDataToPlugin(Widget* pluginWidget) ...@@ -256,109 +256,6 @@ void FrameLoader::redirectDataToPlugin(Widget* pluginWidget)
} }
void FrameLoader::load(const FrameLoadRequest& request, bool userGesture, Event* event,
HTMLFormElement* submitForm, const HashMap<String, String>& formValues)
{
notImplemented();
}
void FrameLoader::load(const KURL& URL, const String& referrer, FrameLoadType newLoadType,
const String& frameName, Event* event, HTMLFormElement* form, const HashMap<String, String>& values)
{
notImplemented();
}
void FrameLoader::load(DocumentLoader* newDocumentLoader)
{
notImplemented();
}
void FrameLoader::load(const KURL&, Event*)
{
notImplemented();
}
void FrameLoader::load(DocumentLoader* loader, FrameLoadType type, PassRefPtr<FormState> formState)
{
notImplemented();
}
void FrameLoader::load(const ResourceRequest& request)
{
notImplemented();
}
void FrameLoader::load(const ResourceRequest& request, const String& frameName)
{
notImplemented();
}
void FrameLoader::load(const ResourceRequest& request, const NavigationAction& action, FrameLoadType type, PassRefPtr<FormState> formState)
{
notImplemented();
}
void FrameLoader::loadResourceSynchronously(const ResourceRequest& request, ResourceResponse& r, Vector<char>& data) {
notImplemented();
}
void FrameLoader::opened()
{
notImplemented();
}
KURL FrameLoader::dataURLBaseFromRequest(const ResourceRequest& request) const
{
notImplemented();
return KURL();
}
void FrameLoader::applyUserAgent(ResourceRequest& request)
{
String userAgent = client()->userAgent();
ASSERT(!userAgent.isNull());
request.setHTTPUserAgent(userAgent);
}
PolicyCheck::PolicyCheck()
: m_contentFunction(0)
{
}
void PolicyCheck::clear()
{
clearRequest();
m_contentFunction = 0;
}
void PolicyCheck::set(ContentPolicyDecisionFunction function, void* argument)
{
m_formState = 0;
m_frameName = String();
m_contentFunction = function;
m_argument = argument;
}
void PolicyCheck::call(bool shouldContinue)
{
notImplemented();
}
void PolicyCheck::call(PolicyAction action)
{
ASSERT(m_contentFunction);
m_contentFunction(m_argument, action);
}
void PolicyCheck::clearRequest()
{
m_formState = 0;
m_frameName = String();
}
} }
// vim: ts=4 sw=4 et // vim: ts=4 sw=4 et
third_party/WebKit/WebCore/loader/qt/MainResourceLoaderQt.cpp 0 → 100644
View file @ a1433d71
/*
* Copyright (C) 2007 George Staikos <staikos@kde.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "MainResourceLoader.h"
#include "FrameQt.h"
#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
namespace WebCore {
PassRefPtr<WebCore::MainResourceLoader> MainResourceLoader::create(WebCore::Frame*)
{
notImplemented();
}
}
third_party/WebKit/WebCore/loader/qt/ResourceLoaderQt.cpp
View file @ a1433d71
...@@ -45,4 +45,24 @@ void ResourceLoader::cancel() ...@@ -45,4 +45,24 @@ void ResourceLoader::cancel()
notImplemented(); notImplemented();
} }
bool ResourceLoader::load(const WebCore::ResourceRequest&)
{
notImplemented();
}
void ResourceLoader::cancel(const WebCore::ResourceError&)
{
notImplemented();
}
void ResourceLoader::releaseResources()
{
notImplemented();
}
void ResourceLoader::addData(const char *, int, bool)
{
notImplemented();
}
} }
third_party/WebKit/WebCore/platform/network/qt/ResourceHandleQt.cpp
View file @ a1433d71
...@@ -80,4 +80,21 @@ bool ResourceHandle::willLoadFromCache(ResourceRequest& request) ...@@ -80,4 +80,21 @@ bool ResourceHandle::willLoadFromCache(ResourceRequest& request)
return false; return false;
} }
bool ResourceHandle::supportsBufferedData()
{
notImplemented();
return false;
}
PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
{
notImplemented();
return 0;
}
void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, ResourceError& e, ResourceResponse& r, Vector<char>& data)
{
notImplemented();
}
} // namespace WebCore } // namespace WebCore
third_party/WebKit/WebCore/platform/qt/LoaderFunctionsQt.cpp
View file @ a1433d71
...@@ -152,9 +152,4 @@ time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse) ...@@ -152,9 +152,4 @@ time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse)
return 0; return 0;
} }
void CachedResource::setAllData(PlatformData allData)
{
m_allData = allData;
}
} // namespace WebCore } // namespace WebCore
third_party/WebKit/WebCore/platform/qt/TemporaryLinkStubs.cpp
View file @ a1433d71
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
#include "IconLoader.h" #include "IconLoader.h"
#include "SystemTime.h" #include "SystemTime.h"
#include <QApplication>
#include <QDesktopWidget>
using namespace WebCore; using namespace WebCore;
#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d (%s)\n", \ #define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d (%s)\n", \
...@@ -147,20 +150,37 @@ String WebCore::contextMenuItemTagRightToLeft() { return String(); } ...@@ -147,20 +150,37 @@ String WebCore::contextMenuItemTagRightToLeft() { return String(); }
void Frame::setNeedsReapplyStyles() { notImplemented(); } void Frame::setNeedsReapplyStyles() { notImplemented(); }
int WebCore::screenDepth(Widget*) { notImplemented(); return 0; } int WebCore::screenDepth(Widget *w)
int WebCore::screenDepthPerComponent(Widget*) { notImplemented(); return 0; } {
bool WebCore::screenIsMonochrome(Widget*) { notImplemented(); return false; } QDesktopWidget *d = QApplication::desktop();
FloatRect WebCore::screenRect(Widget*) return d->screen(d->screenNumber(w->qwidget()))->depth();
{ notImplemented(); return FloatRect(); } }
FloatRect WebCore::screenAvailableRect(Widget*)
{ notImplemented(); return FloatRect(); } int WebCore::screenDepthPerComponent(Widget *w)
{
return w->qwidget()->depth();
}
bool WebCore::screenIsMonochrome(Widget *w)
{
QDesktopWidget *d = QApplication::desktop();
return d->screen(d->screenNumber(w->qwidget()))->numColors() < 2;
}
FloatRect WebCore::screenRect(Widget *w)
{
return (QRectF)QApplication::desktop()->screenGeometry(w->qwidget());
}
FloatRect WebCore::screenAvailableRect(Widget *w)
{
return (QRectF)QApplication::desktop()->availableGeometry(w->qwidget());
}
void WebCore::setFocusRingColorChangeFunction(void (*)()) { notImplemented(); } void WebCore::setFocusRingColorChangeFunction(void (*)()) { notImplemented(); }
void FrameView::updateBorder() { notImplemented(); } void FrameView::updateBorder() { notImplemented(); }
void FrameLoader::reload() { notImplemented(); }
bool AXObjectCache::gAccessibilityEnabled = false; bool AXObjectCache::gAccessibilityEnabled = false;
Vector<char> loadResourceIntoArray(const char*) { return Vector<char>(); } Vector<char> loadResourceIntoArray(const char*) { return Vector<char>(); }
......
third_party/WebKit/WebKitQt/ChangeLog
View file @ a1433d71
2007-01-06 George Staikos <staikos@kde.org>
Reviewed by Brady.
Make it link.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::setMainDocumentError):
(WebCore::FrameLoaderClientQt::committedLoad):
(WebCore::FrameLoaderClientQt::cancelledError):
(WebCore::FrameLoaderClientQt::cannotShowURLError):
(WebCore::FrameLoaderClientQt::interruptForPolicyChangeError):
(WebCore::FrameLoaderClientQt::cannotShowMIMETypeError):
(WebCore::FrameLoaderClientQt::fileDoesNotExistError):
(WebCore::FrameLoaderClientQt::shouldFallBack):
(WebCore::FrameLoaderClientQt::createDocumentLoader):
(WebCore::FrameLoaderClientQt::download):
(WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
(WebCore::FrameLoaderClientQt::dispatchDidReceiveResponse):
(WebCore::FrameLoaderClientQt::dispatchDidReceiveContentLength):
(WebCore::FrameLoaderClientQt::dispatchDidFinishLoading):
(WebCore::FrameLoaderClientQt::dispatchDidFailLoading):
(WebCore::FrameLoaderClientQt::dispatchDidLoadResourceFromMemoryCache):
(WebCore::FrameLoaderClientQt::dispatchDidFailProvisionalLoad):
(WebCore::FrameLoaderClientQt::dispatchDidFailLoad):
(WebCore::FrameLoaderClientQt::dispatchCreatePage):
(WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType):
(WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction):
(WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
(WebCore::FrameLoaderClientQt::dispatchUnableToImplementPolicy):
(WebCore::FrameLoaderClientQt::incrementProgress):
(WebCore::FrameLoaderClientQt::completeProgress):
(WebCore::FrameLoaderClientQt::startDownload):
(WebCore::FrameLoaderClientQt::willUseArchive):
* WebCoreSupport/FrameLoaderClientQt.h:
2007-01-05 Lars Knoll <lars@trolltech.com> 2007-01-05 Lars Knoll <lars@trolltech.com>
Make the Qt build compile again Make the Qt build compile again
......
third_party/WebKit/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
View file @ a1433d71
...@@ -553,6 +553,146 @@ bool FrameLoaderClientQt::canCachePage() const ...@@ -553,6 +553,146 @@ bool FrameLoaderClientQt::canCachePage() const
notImplemented(); notImplemented();
} }
void FrameLoaderClientQt::setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&)
{
notImplemented();
}
void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader*, const char*, int)
{
notImplemented();
}
WebCore::ResourceError FrameLoaderClientQt::cancelledError(const WebCore::ResourceRequest&)
{
notImplemented();
}
WebCore::ResourceError FrameLoaderClientQt::cannotShowURLError(const WebCore::ResourceRequest&)
{
notImplemented();
}
WebCore::ResourceError FrameLoaderClientQt::interruptForPolicyChangeError(const WebCore::ResourceRequest&)
{
notImplemented();
}
WebCore::ResourceError FrameLoaderClientQt::cannotShowMIMETypeError(const WebCore::ResourceResponse&)
{
notImplemented();
}
WebCore::ResourceError FrameLoaderClientQt::fileDoesNotExistError(const WebCore::ResourceResponse&)
{
notImplemented();
}
bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError&)
{
notImplemented();
}
WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClientQt::createDocumentLoader(const WebCore::ResourceRequest&)
{
notImplemented();
}
void FrameLoaderClientQt::download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, void*, WebCore::ResourceRequest&, const WebCore::ResourceResponse&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidReceiveResponse(WebCore::DocumentLoader*, void*, const WebCore::ResourceResponse&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidReceiveContentLength(WebCore::DocumentLoader*, void*, int)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidFinishLoading(WebCore::DocumentLoader*, void*)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidFailLoading(WebCore::DocumentLoader*, void*, const WebCore::ResourceError&)
{
notImplemented();
}
bool FrameLoaderClientQt::dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidFailProvisionalLoad(const WebCore::ResourceError&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDidFailLoad(const WebCore::ResourceError&)
{
notImplemented();
}
WebCore::Frame* FrameLoaderClientQt::dispatchCreatePage()
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDecidePolicyForMIMEType(void (WebCore::FrameLoader::*)(WebCore::PolicyAction), const WebCore::String&, const WebCore::ResourceRequest&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction(void (WebCore::FrameLoader::*)(WebCore::PolicyAction), const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(void (WebCore::FrameLoader::*)(WebCore::PolicyAction), const WebCore::NavigationAction&, const WebCore::ResourceRequest&)
{
notImplemented();
}
void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::ResourceError&)
{
notImplemented();
}
void FrameLoaderClientQt::incrementProgress(void*, const WebCore::ResourceResponse&)
{
notImplemented();
}
void FrameLoaderClientQt::incrementProgress(void*, const char*, int)
{
notImplemented();
}
void FrameLoaderClientQt::completeProgress(void*)
{
notImplemented();
}
void FrameLoaderClientQt::startDownload(const WebCore::ResourceRequest&)
{
notImplemented();
}
bool FrameLoaderClientQt::willUseArchive(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, const WebCore::KURL&) const
{
notImplemented();
}
} }
......
third_party/WebKit/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
View file @ a1433d71
...@@ -159,6 +159,35 @@ namespace WebCore { ...@@ -159,6 +159,35 @@ namespace WebCore {
virtual void saveDocumentViewToPageCache(WebCore::PageCache*); virtual void saveDocumentViewToPageCache(WebCore::PageCache*);
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 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&);
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 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(void (WebCore::FrameLoader::*)(WebCore::PolicyAction), const WebCore::String&, const WebCore::ResourceRequest&);
virtual void dispatchDecidePolicyForNewWindowAction(void (WebCore::FrameLoader::*)(WebCore::PolicyAction), const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String&);
virtual void dispatchDecidePolicyForNavigationAction(void (WebCore::FrameLoader::*)(WebCore::PolicyAction), 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 startDownload(const WebCore::ResourceRequest&);
virtual bool willUseArchive(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, const WebCore::KURL&) const;
// FIXME: This should probably not be here, but it's needed for the tests currently // FIXME: This should probably not be here, but it's needed for the tests currently
virtual void partClearedInBegin(); 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