WebCore:
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Oct 2006 13:10:10 +0000 (13:10 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Oct 2006 13:10:10 +0000 (13:10 +0000)
        Reviewed by Maciej.

        Fix Qt/Linux build.

        - Remove BrowserExtensionQt, move it's methods to Page/FrameQt.
        - Fix CMakeLists.txt to include platform/network.

        * CMakeLists.txt:
        * platform/qt/BrowserExtensionQt.cpp: Removed.
        * platform/qt/BrowserExtensionQt.h: Removed.
        * platform/qt/FrameQt.cpp:
        (WebCore::FrameQt::FrameQt):
        (WebCore::FrameQt::createNewWindow):
        (WebCore::FrameQt::goBackOrForward):
        (WebCore::FrameQt::historyURL):
        (WebCore::FrameQt::getHistoryLength):
        * platform/qt/FrameQt.h:
        * platform/qt/PageQt.cpp:
        (WebCore::Page::canRunModal):
        (WebCore::Page::canRunModalNow):
        (WebCore::Page::runModal):

WebKitQt:

        Reviewed by Maciej.

        Fix Qt/Linux build.

        - Remove BrowserExtensionQt, move it's methods to Page/FrameQt.
        - Fix CMakeLists.txt to include platform/network.

        * QtLauncher/CMakeLists.txt:
        * WebKitPart/CMakeLists.txt:

WebKitTools:

        Reviewed by Maciej.

        Fix Qt/Linux build.

        - Remove BrowserExtensionQt, move it's methods to Page/FrameQt.
        - Fix CMakeLists.txt to include platform/network.

        * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt:

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

12 files changed:
WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/platform/qt/BrowserExtensionQt.cpp [deleted file]
WebCore/platform/qt/BrowserExtensionQt.h [deleted file]
WebCore/platform/qt/FrameQt.cpp
WebCore/platform/qt/FrameQt.h
WebCore/platform/qt/PageQt.cpp
WebKitQt/ChangeLog
WebKitQt/QtLauncher/CMakeLists.txt
WebKitQt/WebKitPart/CMakeLists.txt
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt

index b1f600db590ffb920797bf45595cd07f179509c6..bd9414b92b5d1a4b736e1ff325d48b93a0503068 100644 (file)
@@ -1028,7 +1028,6 @@ set(WebCore_SRCS
     platform/qt/StringQt.cpp
     platform/qt/ColorQt.cpp
     platform/qt/GlyphMapQt.cpp
-    platform/qt/BrowserExtensionQt.cpp
     platform/qt/CookieJarQt.cpp
     platform/qt/FontPlatformDataQt.cpp
     platform/qt/GraphicsContextQt.cpp
index 56711971466d2e32d78461e7e935f124ebe4b9e8..0c90b6c069ebfb4b4f964bc618ec3bf73c176f9e 100644 (file)
@@ -1,3 +1,27 @@
+2006-10-24  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Maciej.
+
+        Fix Qt/Linux build.
+
+        - Remove BrowserExtensionQt, move it's methods to Page/FrameQt.
+        - Fix CMakeLists.txt to include platform/network.
+
+        * CMakeLists.txt:
+        * platform/qt/BrowserExtensionQt.cpp: Removed.
+        * platform/qt/BrowserExtensionQt.h: Removed.
+        * platform/qt/FrameQt.cpp:
+        (WebCore::FrameQt::FrameQt):
+        (WebCore::FrameQt::createNewWindow):
+        (WebCore::FrameQt::goBackOrForward):
+        (WebCore::FrameQt::historyURL):
+        (WebCore::FrameQt::getHistoryLength):
+        * platform/qt/FrameQt.h:
+        * platform/qt/PageQt.cpp:
+        (WebCore::Page::canRunModal):
+        (WebCore::Page::canRunModalNow):
+        (WebCore::Page::runModal):
+
 2006-10-24  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
 
         Reviewed by Tim H.
diff --git a/WebCore/platform/qt/BrowserExtensionQt.cpp b/WebCore/platform/qt/BrowserExtensionQt.cpp
deleted file mode 100644 (file)
index 86415fe..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2006 George Staikos <staikos@kde.org>
- * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
- *
- * All rights reserved.
- *
- * 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 <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)
-
-namespace WebCore {
-
-BrowserExtensionQt::BrowserExtensionQt(Frame* frame)
-    : m_frame(frame) 
-{
-}
-
-bool BrowserExtensionQt::canRunModal() 
-{
-    notImplemented();
-    return false;
-}
-
-void BrowserExtensionQt::createNewWindow(const FrameLoadRequest& request, const WindowFeatures& args, Frame*& frame)
-{
-    notImplemented();
-}
-
-bool BrowserExtensionQt::canRunModalNow() 
-{
-    notImplemented();
-    return false;
-}
-
-void BrowserExtensionQt::runModal() 
-{
-    notImplemented();
-}
-
-void BrowserExtensionQt::goBackOrForward(int) 
-{
-    notImplemented();
-}
-
-KURL BrowserExtensionQt::historyURL(int distance) 
-{
-    notImplemented();
-    return KURL();
-}
-
-int BrowserExtensionQt::getHistoryLength()
-{
-    notImplemented();
-    return 0;
-}
-
-}
-
-// vim: ts=4 sw=4 et
diff --git a/WebCore/platform/qt/BrowserExtensionQt.h b/WebCore/platform/qt/BrowserExtensionQt.h
deleted file mode 100644 (file)
index 7927c8d..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
- * All rights reserved.
- *
- * 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. 
- */
-
-#ifndef BrowserExtensionQt_H_
-#define BrowserExtensionQt_H_
-
-#include "BrowserExtension.h"
-
-namespace WebCore {
-
-class Frame;
-
-class BrowserExtensionQt : public BrowserExtension {
-public:
-    BrowserExtensionQt(Frame*);
-
-    virtual void createNewWindow(const FrameLoadRequest&, const WindowFeatures&, Frame*&);
-
-    virtual int getHistoryLength();
-    virtual void goBackOrForward(int distance);
-    virtual KURL historyURL(int distance);
-
-    virtual bool canRunModal();
-    virtual bool canRunModalNow();
-    virtual void runModal();
-
-private:
-    Frame* m_frame;
-};
-
-}
-
-#endif
-
-// vim: ts=4 sw=4 et
index 79f3a71aefc382bbb364f980ec50db374dd31fde..f862f7b498966c9ad14ac3bfa342c11c8668dfe4 100644 (file)
@@ -44,7 +44,6 @@
 #include "EditorClientQt.h"
 #include "FrameLoadRequest.h"
 #include "DOMImplementation.h"
-#include "BrowserExtensionQt.h"
 #include "ResourceLoaderInternal.h"
 #include "Document.h"
 #include "Settings.h"
@@ -99,7 +98,6 @@ FrameQt::FrameQt(Page* page, Element* ownerElement, FrameQtClient* frameClient,
     : Frame(page, ownerElement, (editorClient ? editorClient : new EditorClientQt()))
     , m_bindingRoot(0)
 {
-    d->m_extension = new BrowserExtensionQt(this);
     Settings* settings = new Settings;
     settings->setAutoLoadImages(true);
     settings->setMinFontSize(5);
@@ -574,6 +572,28 @@ FrameQtClient* FrameQt::client() const
     return m_client;
 }
 
+void FrameQt::createNewWindow(const FrameLoadRequest& request, const WindowFeatures& args, Frame*& frame)
+{
+    notImplemented();
+}
+
+void FrameQt::goBackOrForward(int) 
+{
+    notImplemented();
+}
+
+KURL FrameQt::historyURL(int distance) 
+{
+    notImplemented();
+    return KURL();
+}
+
+int FrameQt::getHistoryLength()
+{
+    notImplemented();
+    return 0;
+}
+
 }
 
 // vim: ts=4 sw=4 et
index 54436b19b2796c1feefccd8b08dcfbf4e20a80e7..572d700994165689835fcc44c11cf70347e9bbc1 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "Frame.h"
 #include "FrameQtClient.h"
+#include "WindowFeatures.h"
 
 class QWidget;
 class QPaintEvent;
@@ -137,6 +138,12 @@ public:
 
     FrameQtClient* client() const;
 
+    void createNewWindow(const FrameLoadRequest&, const WindowFeatures&, Frame*&);
+    void goBackOrForward(int);
+
+    KURL historyURL(int distance);
+    int getHistoryLength();
+
 private:
     void init();
 
index 80a1824a1a9ffb30b8079e8adbb0c3bed2349a4f..475ddf45a50f9f1f2dc7d2ebefbfb1ffa83c1463 100644 (file)
@@ -37,6 +37,8 @@
 #include "Frame.h"
 #include "FrameView.h"
 
+#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
+
 namespace WebCore {
 
 static QWidget* rootWindowForFrame(const Frame* frame)
@@ -64,6 +66,23 @@ void Page::setWindowRect(const FloatRect& r)
         widget->setGeometry(QRect(qRound(r.x()), qRound(r.y()), qRound(r.width()), qRound(r.height())));
 }
 
+bool Page::canRunModal()
+{
+    notImplemented();
+    return false;
+}
+
+bool Page::canRunModalNow()
+{
+    notImplemented();
+    return false;
+}
+
+void Page::runModal() 
+{
+    notImplemented();
+}
+
 }
 
 // vim: ts=4 sw=4 et
index 224de8e3c0724d3450e9fcf4eb42038a828e713c..ea73e16e9eb31686879c0a0e8cb2006b2643179a 100644 (file)
@@ -1,3 +1,15 @@
+2006-10-24  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Maciej.
+
+        Fix Qt/Linux build.
+
+        - Remove BrowserExtensionQt, move it's methods to Page/FrameQt.
+        - Fix CMakeLists.txt to include platform/network.
+
+        * QtLauncher/CMakeLists.txt:
+        * WebKitPart/CMakeLists.txt:
+
 2006-10-24  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Darin.
index af0f1e7960bccac9e51d82984bf3701fe9af0b56..b12a3b07b708a16e634ee9d3dc810eb92ce46328 100644 (file)
@@ -5,6 +5,7 @@ include_directories(
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/page
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/loader
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform
+   BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/network
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/qt
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2/svg
index ed1026959ac534e7ce673e8c61375ce77dd75a4b..1c92d8eb4f9e5b42955bff9447baaa5fb1d64f8c 100644 (file)
@@ -5,6 +5,7 @@ include_directories (
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/page
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/loader
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform
+   BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/network
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/qt
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2/css
index 35442c0d441b05fc934dcdaa644a8788c802dbae..79f53c53a6c118058600cf6c0f7c415c77431428 100644 (file)
@@ -1,3 +1,14 @@
+2006-10-24  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Maciej.
+
+        Fix Qt/Linux build.
+
+        - Remove BrowserExtensionQt, move it's methods to Page/FrameQt.
+        - Fix CMakeLists.txt to include platform/network.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt:
+
 2006-10-24  David Smith  <catfish.man@gmail.com>
 
         Reviewed by Tim H.
index 87b8bba44047220f431d047efc5e66526ff7914a..fad811483c6386d56708e73e993f888f3002c9ba 100644 (file)
@@ -5,6 +5,7 @@ include_directories(
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/page
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/loader
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform
+   BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform/network
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform/qt
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/ksvg2
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/ksvg2/svg