2006-10-19 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed and landed by Anders.

        Fix Qt/Linux build.

        * CMakeLists.txt:
        * loader/Cache.h:
        * platform/qt/BrowserExtensionQt.cpp:
        * platform/qt/BrowserExtensionQt.h:
        * platform/qt/CursorQt.cpp:
        (WebCore::pointerCursor):
        * platform/qt/LoaderFunctionsQt.cpp:
        (WebCore::NumberOfPendingOrLoadingRequests):
        (WebCore::CheckCacheObjectStatus):
        * platform/qt/ResourceLoaderQt.cpp:
        (WebCore::ResourceLoader::retrieveResponseEncoding):
        (WebCore::ResourceLoader::receivedResponse):

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

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 7632084b5e022ea4c8cd78fd75262ecf6b9e7e08..eb3530e168ada0b4f392da9f16a4ed2350c494bd 100644 (file)
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -32,7 +32,6 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}/ksvg2/misc 
    ${CMAKE_CURRENT_BINARY_DIR}/ksvg2/misc 
    ${CMAKE_CURRENT_SOURCE_DIR}/ksvg2/events
-   ${CMAKE_CURRENT_SOURCE_DIR}/ksvg2/bindings/js
    ${CMAKE_CURRENT_BINARY_DIR}/platform
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/image-decoders
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/image-decoders/gif
@@ -210,7 +209,7 @@ set(IDL_BINDINGS_SVG
   ksvg2/svg/SVGUnitTypes.idl
   ksvg2/svg/SVGUseElement.idl
   ksvg2/svg/SVGViewElement.idl
-  ksvg2/svg/SVGZoomEvent.idl
+  ksvg2/events/SVGZoomEvent.idl
 )
 ENDIF (WEBKIT_USE_SVG_SUPPORT)
 
@@ -377,13 +376,11 @@ create_generated_cpp_helper(JSHTMLInputElementBaseTable.inl)
 
 
 IF (WEBKIT_USE_SVG_SUPPORT)
-
-    create_cpp_lut(ksvg2/bindings/js/JSSVGNumber.cpp JSSVGNumberTable.inl ksvg2/bindings/js/JSSVGNumber.cpp)
-    create_cpp_lut(ksvg2/bindings/js/JSSVGPoint.cpp JSSVGPointTable.inl ksvg2/bindings/js/JSSVGPoint.cpp)
+    create_cpp_lut(bindings/js/JSSVGNumber.cpp JSSVGNumberTable.inl bindings/js/JSSVGNumber.cpp)
+    create_cpp_lut(bindings/js/JSSVGPoint.cpp JSSVGPointTable.inl bindings/js/JSSVGPoint.cpp)
     create_generated_cpp_helper(JSSVGPointTable.inl)
-    create_cpp_lut(ksvg2/bindings/js/JSSVGRect.cpp JSSVGRectTable.inl ksvg2/bindings/js/JSSVGRect.cpp)
+    create_cpp_lut(bindings/js/JSSVGRect.cpp JSSVGRectTable.inl bindings/js/JSSVGRect.cpp)
     create_generated_cpp_helper(JSSVGRectTable.inl)
-
 ENDIF (WEBKIT_USE_SVG_SUPPORT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tokenizer.inl
@@ -520,10 +517,10 @@ set (SVG_SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/ksvg2/misc/XLinkNames.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/xml/XMLNames.cpp
 
-    ksvg2/bindings/js/JSSVGPoint.cpp
-    ksvg2/bindings/js/JSSVGRect.cpp
-    ksvg2/bindings/js/JSSVGNumber.cpp
-    ksvg2/bindings/js/JSSVGElementWrapperFactory.cpp 
+    bindings/js/JSSVGPoint.cpp
+    bindings/js/JSSVGRect.cpp
+    bindings/js/JSSVGNumber.cpp
+    bindings/js/JSSVGElementWrapperFactory.cpp 
 
     ksvg2/css/SVGCSSParser.cpp
     ksvg2/css/SVGRenderStyleDefs.cpp
@@ -929,6 +926,7 @@ set(WebCore_SRCS
     html/CanvasGradient.cpp
     html/HTMLViewSourceDocument.cpp
     html/HTMLFrameElement.cpp
+    html/HTMLFrameElementBase.cpp
     html/HTMLAnchorElement.cpp
     html/HTMLTableCellElement.cpp
     html/CanvasPattern.cpp

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 48d056d7784f15a43aa46b965ee03c0e379363d0..681fa9b61b22cac76168defe5f65c8c7a4448cfb 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2006-10-19  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed and landed by Anders.
+
+        Fix Qt/Linux build.
+
+        * CMakeLists.txt:
+        * loader/Cache.h:
+        * platform/qt/BrowserExtensionQt.cpp:
+        * platform/qt/BrowserExtensionQt.h:
+        * platform/qt/CursorQt.cpp:
+        (WebCore::pointerCursor):
+        * platform/qt/LoaderFunctionsQt.cpp:
+        (WebCore::NumberOfPendingOrLoadingRequests):
+        (WebCore::CheckCacheObjectStatus):
+        * platform/qt/ResourceLoaderQt.cpp:
+        (WebCore::ResourceLoader::retrieveResponseEncoding):
+        (WebCore::ResourceLoader::receivedResponse):
+
 2006-10-19  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by ap.

diff --git a/WebCore/loader/Cache.h b/WebCore/loader/Cache.h
index 6cd844f71a15c461d87dacb0c6dbe68281ef9baa..12fd20fa1ae609a049190065e03c4add1b38e1c4 100644 (file)
--- a/WebCore/loader/Cache.h
+++ b/WebCore/loader/Cache.h
@@ -29,7 +29,7 @@
 
 #include "CachePolicy.h"
 #include "CachedResource.h"
-#include "Loader.h"
+#include "loader.h"
 #include "PlatformString.h"
 #include "StringHash.h"
 #include <wtf/Vector.h>

diff --git a/WebCore/platform/qt/BrowserExtensionQt.cpp b/WebCore/platform/qt/BrowserExtensionQt.cpp
index 27ff00537380e85c8045bd673bbb99979737256a..86415fe389c3017b7b310316c35944078c5693e8 100644 (file)
--- a/WebCore/platform/qt/BrowserExtensionQt.cpp
+++ b/WebCore/platform/qt/BrowserExtensionQt.cpp
@@ -26,8 +26,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdio.h>
 #include <wtf/Platform.h>
 
+#include "KURL.h"
 #include "BrowserExtensionQt.h"
 
 #define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
@@ -45,10 +47,6 @@ bool BrowserExtensionQt::canRunModal()
     return false;
 }
 
-void BrowserExtensionQt::createNewWindow(const FrameLoadRequest& request)
-{
-}
-
 void BrowserExtensionQt::createNewWindow(const FrameLoadRequest& request, const WindowFeatures& args, Frame*& frame)
 {
     notImplemented();
@@ -76,16 +74,6 @@ KURL BrowserExtensionQt::historyURL(int distance)
     return KURL();
 }
 
-void BrowserExtensionQt::setTypedIconURL(KURL const&, const String&) 
-{
-    notImplemented();
-}
-
-void BrowserExtensionQt::setIconURL(KURL const&) 
-{
-    notImplemented();
-}
-
 int BrowserExtensionQt::getHistoryLength()
 {
     notImplemented();

diff --git a/WebCore/platform/qt/BrowserExtensionQt.h b/WebCore/platform/qt/BrowserExtensionQt.h
index 22b49efa9e2fea44aed03dab568cc35930aa1ad9..7927c8de685fe5aec4398bd4d2c2385df1cfcca4 100644 (file)
--- a/WebCore/platform/qt/BrowserExtensionQt.h
+++ b/WebCore/platform/qt/BrowserExtensionQt.h
@@ -38,12 +38,8 @@ class BrowserExtensionQt : public BrowserExtension {
 public:
     BrowserExtensionQt(Frame*);
 
-    virtual void createNewWindow(const FrameLoadRequest&);
     virtual void createNewWindow(const FrameLoadRequest&, const WindowFeatures&, Frame*&);
 
-    virtual void setIconURL(const KURL&);
-    virtual void setTypedIconURL(const KURL&, const String& type);
-
     virtual int getHistoryLength();
     virtual void goBackOrForward(int distance);
     virtual KURL historyURL(int distance);

diff --git a/WebCore/platform/qt/CursorQt.cpp b/WebCore/platform/qt/CursorQt.cpp
index fe35cce5651c416332ea119828ad40cb578c5930..6f2105437d0f3853c6a92cb766212e90d50b8faa 100644 (file)
--- a/WebCore/platform/qt/CursorQt.cpp
+++ b/WebCore/platform/qt/CursorQt.cpp
@@ -72,6 +72,7 @@ protected:
     Cursors()
         : CrossCursor(QCursor(Qt::CrossCursor))
         , MoveCursor(QCursor(Qt::SizeAllCursor))
+        , PointerCursor(QCursor(Qt::ArrowCursor))
         , PointingHandCursor(QCursor(Qt::PointingHandCursor))
         , IBeamCursor(QCursor(Qt::IBeamCursor))
         , WaitCursor(QCursor(Qt::WaitCursor))
@@ -95,6 +96,7 @@ public:
 
     Cursor CrossCursor;
     Cursor MoveCursor;
+    Cursor PointerCursor;
     Cursor PointingHandCursor;
     Cursor IBeamCursor;
     Cursor WaitCursor;
@@ -119,6 +121,11 @@ Cursors* Cursors::self()
 
 }
 
+const Cursor& pointerCursor()
+{
+    return Cursors::self()->PointerCursor;
+}
+
 const Cursor& moveCursor()
 {
     return Cursors::self()->MoveCursor;

diff --git a/WebCore/platform/qt/LoaderFunctionsQt.cpp b/WebCore/platform/qt/LoaderFunctionsQt.cpp
index b8dbf69df4bb905cefd7839fbb0a9b3d8fbe3296..ff6eb9754be0b5955bfcf4d56760059c39bb692d 100644 (file)
--- a/WebCore/platform/qt/LoaderFunctionsQt.cpp
+++ b/WebCore/platform/qt/LoaderFunctionsQt.cpp
@@ -73,7 +73,7 @@ Vector<char> ServeSynchronousRequest(Loader*, DocLoader* docLoader, ResourceLoad
 
 int NumberOfPendingOrLoadingRequests(DocLoader* docLoader)
 {
-    return Cache::loader()->numRequests(docLoader);
+    return cache()->loader()->numRequests(docLoader);
 }
 
 bool CheckIfReloading(WebCore::DocLoader* docLoader)
@@ -89,9 +89,7 @@ void CheckCacheObjectStatus(DocLoader* docLoader, CachedResource* cachedObject)
         return;
 
     switch (cachedObject->status()) {
-        case CachedResource::Persistent:
         case CachedResource::Cached:
-        case CachedResource::Uncacheable:
             break;
         case CachedResource::NotCached:
         case CachedResource::Unknown:

diff --git a/WebCore/platform/qt/ResourceLoaderQt.cpp b/WebCore/platform/qt/ResourceLoaderQt.cpp
index 58d0391810115b14dac28a51be226ea2948f60ac..104170629ccc4f9e467fd24445e4405f8334a014 100644 (file)
--- a/WebCore/platform/qt/ResourceLoaderQt.cpp
+++ b/WebCore/platform/qt/ResourceLoaderQt.cpp
@@ -80,11 +80,11 @@ void ResourceLoader::assembleResponseHeaders() const
     }
 }
 
-void ResourceLoader::retrieveCharset() const
+void ResourceLoader::retrieveResponseEncoding() const
 {
-    if (!d->retrievedCharset) {
-        d->retrievedCharset = true;
-        d->metaData.set("charset", extractCharsetFromHeaders(d->responseHeaders));
+    if (!d->m_retrievedResponseEncoding) {
+        d->m_responseEncoding = extractCharsetFromHeaders(d->responseHeaders);
+        d->m_retrievedResponseEncoding = true;
     }
 }
 
@@ -93,7 +93,7 @@ void ResourceLoader::receivedResponse(PlatformResponse response)
     Q_ASSERT(method() == "POST");
 
     d->assembledResponseHeaders = false;
-    d->retrievedCharset = false;
+    d->m_retrievedResponseEncoding = false;
     d->m_response = response;
 
     if (d->client)