Fix the Qt build

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

diff --git a/ChangeLog b/ChangeLog
index a57225faca2419d860d905f61958c1334fa0ada0..d3b29e5f44c4625db6df5edbb1397266f119e7a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-03  Lars Knoll <lars@trolltech.com>
+
+        Fix the Qt build
+
+        * WebKit.pri:
+
 2006-12-17  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Rob Buis.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8f28d7ea1668a88cc50d3d6ffe8df7f0b310e0d..716fd2037a9d9b155057be839c8b1381d6531b89 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2007-01-03  Lars Knoll <lars@trolltech.com>
+
+        Fix the Qt build
+
+        * WebCore.pro:
+        * history/qt/PageCacheQt.cpp: Added.
+        (WebCore::PageCache::close):
+        * loader/qt/DocumentLoaderQt.cpp:
+        (WebCore::DocumentLoader::getResponseRefreshAndModifiedHeaders):
+        (WebCore::DocumentLoader::urlForHistory):
+        * loader/qt/FrameLoaderQt.cpp:
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+        (WebCore::FrameLoader::didFirstLayout):
+        (WebCore::FrameLoader::load):
+        (WebCore::FrameLoader::opened):
+        (WebCore::FrameLoader::dataURLBaseFromRequest):
+        (WebCore::FrameLoader::applyUserAgent):
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::loadsBlocked):
+        (WebCore::ResourceHandle::willLoadFromCache):
+
 2007-01-02  Brady Eidson  <beidson@apple.com>
 
         Reviewed extensively and repeatedly by Darin

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 826b6d6a5a6f03d9a2192369d6802e8166b82c5f..87f5f6b7cf578bf6fcb0c88f86ebd9656b1c0790 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -59,6 +59,7 @@ INCLUDEPATH +=  $$PWD \
                 $$PWD/editing \
                 $$PWD/kwq \
                 $$PWD/rendering \
+                $$PWD/history \
                 $$PWD/xml \
                 $$PWD/html \
                 $$PWD/bindings/js \
@@ -845,6 +846,7 @@ contains(DEFINES, SVG_SUPPORT=1) {
         ksvg2/svg/SVGFECompositeElement.cpp \
         ksvg2/svg/SVGImageElement.cpp \
         ksvg2/svg/SVGAnimateElement.cpp \
+        ksvg2/svg/SVGAnimateMotionElement.cpp \
         ksvg2/svg/SVGURIReference.cpp \
         ksvg2/svg/SVGLength.cpp \
         ksvg2/svg/SVGPathSegCurvetoCubic.cpp \
@@ -1001,7 +1003,12 @@ contains(DEFINES, SVG_SUPPORT=1) {
         rendering/RenderSVGText.cpp \
         rendering/RenderSVGTSpan.cpp \
         rendering/SVGInlineFlowBox.cpp \
-        rendering/SVGRootInlineBox.cpp
+        rendering/SVGRootInlineBox.cpp \
+        history/BackForwardList.cpp \
+        history/HistoryItem.cpp \
+        history/HistoryItemTimer.cpp \
+        history/PageCache.cpp \
+        history/qt/PageCacheQt.cpp \
 
         # GENERATOR 5-B:
         svgnames_a.output = tmp/SVGNames.cpp

diff --git a/WebCore/history/qt/PageCacheQt.cpp b/WebCore/history/qt/PageCacheQt.cpp
new file mode 100644 (file)
index 0000000..a64b9db
--- /dev/null
+++ b/WebCore/history/qt/PageCacheQt.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2006 Trolltech ASA
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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 "PageCache.h"
+
+namespace WebCore {
+
+void PageCache::close()
+{
+    if (!m_pageState)
+        return;
+    
+    // FIXME: <rdar://problem/4886844>
+    // The current method of tracking the "document view" is messy and quite platform specific
+    // Having a WebCore-way to track this would be great.
+//     if (m_documentView)
+//         objc_msgSend(m_documentView.get(), @selector(closeIfNotCurrentView));
+
+    m_pageState->clear();
+    
+    // Setting these to null is how the PageCache object knows it's been closed
+    m_pageState = 0;
+    m_documentLoader = 0;
+}
+
+} //namespace WebCore
+

diff --git a/WebCore/loader/qt/DocumentLoaderQt.cpp b/WebCore/loader/qt/DocumentLoaderQt.cpp
index abdf3984fcacee1f81bddd984cd6846e5fdb1c55..97d9a3d74c9c6bc7e704dfe947ee59220dd15961 100644 (file)
--- a/WebCore/loader/qt/DocumentLoaderQt.cpp
+++ b/WebCore/loader/qt/DocumentLoaderQt.cpp
@@ -408,14 +408,15 @@ void DocumentLoader::setTitle(const String& title)
     }
 }
 
-KURL DocumentLoader::URLForHistory() const
+bool DocumentLoader::getResponseRefreshAndModifiedHeaders(WebCore::String&, WebCore::String&) const
 {
-    // Return the URL to be used for history and B/F list.
-    // Returns nil for WebDataProtocol URLs that aren't alternates 
-    // for unreachable URLs, because these can't be stored in history.
-    KURL url;
     notImplemented();
-    return url;
+}
+
+KURL DocumentLoader::urlForHistory() const
+{
+    notImplemented();
+    return KURL();
 }
 
 }

diff --git a/WebCore/loader/qt/FrameLoaderQt.cpp b/WebCore/loader/qt/FrameLoaderQt.cpp
index f8061837061e8600a90272b40f84b9ad0a379d0a..74b1cd5c7306e64474646f9901e15c9945f1a6ef 100644 (file)
--- a/WebCore/loader/qt/FrameLoaderQt.cpp
+++ b/WebCore/loader/qt/FrameLoaderQt.cpp
@@ -195,9 +195,9 @@ void FrameLoader::checkLoadCompleteForThisFrame()
         m_client->forceLayoutForNonHTML();
              
         // If the user had a scroll point, scroll to it, overriding the anchor point if any.
-        if ((isBackForwardLoadType(m_loadType) || m_loadType == FrameLoadTypeReload)
-            && m_client->hasBackForwardList())
-            m_client->restoreScrollPositionAndViewState();
+//         if ((isBackForwardLoadType(m_loadType) || m_loadType == FrameLoadTypeReload)
+//             && m_client->hasBackForwardList())
+//             m_client->restoreScrollPositionAndViewState();
 
 //         if (error)
 //             m_client->dispatchDidFailLoad(error);
@@ -217,11 +217,6 @@ void FrameLoader::checkLoadCompleteForThisFrame()
 
 }
 
-void FrameLoader::goBackOrForward(int distance)
-{
-    notImplemented();
-}
-
 KURL FrameLoader::historyURL(int distance)
 {
     notImplemented();
@@ -230,8 +225,8 @@ KURL FrameLoader::historyURL(int distance)
 
 void FrameLoader::didFirstLayout()
 {
-    if (isBackForwardLoadType(m_loadType) && m_client->hasBackForwardList())
-        m_client->restoreScrollPositionAndViewState();
+//     if (isBackForwardLoadType(m_loadType) && m_client->hasBackForwardList())
+//         m_client->restoreScrollPositionAndViewState();
 
     m_firstLayoutDone = true;
     m_client->dispatchDidFirstLayout();
@@ -249,17 +244,6 @@ void FrameLoader::partClearedInBegin()
         static_cast<FrameLoaderClientQt*>(m_client)->partClearedInBegin();
 }
 
-void FrameLoader::saveDocumentState()
-{
-    // Do not save doc state if the page has a password field and a form that would be submitted via https.
-    //notImplemented();
-}
-
-void FrameLoader::restoreDocumentState()
-{
-    //notImplemented();
-}
-
 void FrameLoader::didChangeTitle(DocumentLoader* loader)
 {
     notImplemented();
@@ -299,11 +283,44 @@ void FrameLoader::load(DocumentLoader* loader, FrameLoadType type, PassRefPtr<Fo
     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)
 {

diff --git a/WebCore/platform/network/qt/ResourceHandleQt.cpp b/WebCore/platform/network/qt/ResourceHandleQt.cpp
index 280d8fff853c51eea2896b90d27d82fb71b34270..4e658ed5b887d75a98d1e7e2a4548fdc3fe12d03 100644 (file)
--- a/WebCore/platform/network/qt/ResourceHandleQt.cpp
+++ b/WebCore/platform/network/qt/ResourceHandleQt.cpp
@@ -71,7 +71,13 @@ void ResourceHandle::cancel()
 bool ResourceHandle::loadsBlocked()
 {
     notImplemented();
+    return false;
 }
 
+bool ResourceHandle::willLoadFromCache(ResourceRequest& request)
+{
+    notImplemented();
+    return false;
+}
 
 } // namespace WebCore

diff --git a/WebKit.pri b/WebKit.pri
index 06686c6a8ed77c124a75724002c4c0285bb4dbc4..379de9eacad9e286ac21ae61c4235cd5cf1aa8fa 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -10,6 +10,7 @@ INCLUDEPATH += $$PWD/JavaScriptCore \
                $$PWD/WebCore/page \
                $$PWD/WebCore/dom \
                $$PWD/WebCore/html \
+               $$PWD/WebCore/history \
                $$PWD/WebCore/rendering \
                $$PWD/WebCore/loader \
                $$PWD/WebCore/loader/qt \

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index c636e7e2cc1805c7ad8317968ffa0508fc1378d2..2e333c3d432c3c0c23065802f2a2d40b2c8a5de1 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,17 @@
+2007-01-03  Lars Knoll <lars@trolltech.com>
+
+        Fix the Qt build
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::setDocumentViewFromPageCache):
+        (WebCore::FrameLoaderClientQt::updateGlobalHistoryForStandardLoad):
+        (WebCore::FrameLoaderClientQt::updateGlobalHistoryForReload):
+        (WebCore::FrameLoaderClientQt::shouldGoToHistoryItem):
+        (WebCore::FrameLoaderClientQt::saveScrollPositionAndViewStateToItem):
+        (WebCore::FrameLoaderClientQt::saveDocumentViewToPageCache):
+        (WebCore::FrameLoaderClientQt::canCachePage):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
 2006-12-29  George Staikos  <staikos@kde.org>
 
         Add missing notimplemented.

diff --git a/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
index 4303f64d0e6c50f3f6f39dfeb40c7dd945458119..81f82cb1bc59566dd5fbf99cda7f901fa7616d85 100644 (file)
--- a/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -518,6 +518,42 @@ void FrameLoaderClientQt::partClearedInBegin()
     notImplemented();
 }
 
+void FrameLoaderClientQt::setDocumentViewFromPageCache(WebCore::PageCache*)
+{
+    notImplemented();
+}
+
+void FrameLoaderClientQt::updateGlobalHistoryForStandardLoad(const WebCore::KURL&)
+{
+    notImplemented();
+}
+
+void FrameLoaderClientQt::updateGlobalHistoryForReload(const WebCore::KURL&)
+{
+    notImplemented();
+}
+
+bool FrameLoaderClientQt::shouldGoToHistoryItem(WebCore::HistoryItem*) const
+{
+    notImplemented();
+}
+
+void FrameLoaderClientQt::saveScrollPositionAndViewStateToItem(WebCore::HistoryItem*)
+{
+    notImplemented();
+}
+
+void FrameLoaderClientQt::saveDocumentViewToPageCache(WebCore::PageCache*)
+{
+    notImplemented();
+}
+
+bool FrameLoaderClientQt::canCachePage() const
+{
+    notImplemented();
+}
+
+
 }
 
 

diff --git a/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
index c22f6e674a3de4b004db2915008e28f65a0a38fe..2f51a140107ffd15780e4c3652d03d846bb85e7e 100644 (file)
--- a/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
+++ b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
@@ -150,8 +150,18 @@ namespace WebCore {
 
         virtual String userAgent();
 
+
+        virtual void setDocumentViewFromPageCache(WebCore::PageCache*);
+        virtual void updateGlobalHistoryForStandardLoad(const WebCore::KURL&);
+        virtual void updateGlobalHistoryForReload(const WebCore::KURL&);
+        virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
+        virtual void saveScrollPositionAndViewStateToItem(WebCore::HistoryItem*);
+        virtual void saveDocumentViewToPageCache(WebCore::PageCache*);
+        virtual bool canCachePage() const;
+        
         // FIXME: This should probably not be here, but it's needed for the tests currently
         virtual void partClearedInBegin();
+        
     };
 
 }