2006-09-15 Nikolas Zimmermann <zimmermann@kde.org>
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Sep 2006 23:30:47 +0000 (23:30 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Sep 2006 23:30:47 +0000 (23:30 +0000)
        Reviewed by eseidel.  Landed by eseidel.

        Fix build on Qt/Linux and implement Frame::addMessageToConsole to
        be able to see javascript errors for instance.

        * CMakeLists.txt:
        * platform/qt/FrameQt.h:
        * platform/qt/FrameQt.cpp: Implement addMessageToConsole.
        (WebCore::FrameQt::bindingRootObject):
        * platform/qt/TemporaryLinkStubs.cp
        (WebCore::IconDatabase::hasEntryForIconURL):
        (WebCore::IconDatabase::sharedIconDatabase):

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

WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/platform/qt/FrameQt.cpp
WebCore/platform/qt/FrameQt.h
WebCore/platform/qt/TemporaryLinkStubs.cpp

index 553a7bedbf1692034f6ac1c5828f0338a066c8ab..ec41674682b50969a662614fa2cd62cc0c374d65 100644 (file)
@@ -8,6 +8,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}/ForwardingHeaders
    ${CMAKE_CURRENT_SOURCE_DIR}/platform
    ${CMAKE_CURRENT_SOURCE_DIR}/loader
+   ${CMAKE_CURRENT_SOURCE_DIR}/loader/icon
    ${CMAKE_CURRENT_BINARY_DIR}/css
    ${CMAKE_CURRENT_SOURCE_DIR}/css
    ${CMAKE_CURRENT_SOURCE_DIR}/dom
index 9ec07096ae81f704373829e81a37636ca5c1f7c0..df07079b46646fc9f7632f3c85da81d075042c73 100644 (file)
@@ -1,3 +1,18 @@
+2006-09-15  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by eseidel.  Landed by eseidel.
+
+        Fix build on Qt/Linux and implement Frame::addMessageToConsole to
+        be able to see javascript errors for instance.
+
+        * CMakeLists.txt:
+        * platform/qt/FrameQt.h:
+        * platform/qt/FrameQt.cpp: Implement addMessageToConsole.
+        (WebCore::FrameQt::bindingRootObject):
+        * platform/qt/TemporaryLinkStubs.cp
+        (WebCore::IconDatabase::hasEntryForIconURL):
+        (WebCore::IconDatabase::sharedIconDatabase):
+
 2006-09-15  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Tim H.
index 026190cc1317009a5c9ef036db3d10ba53c50435..122d76cdbc422c3046680a85c53c0108ea838363 100644 (file)
@@ -325,7 +325,8 @@ String FrameQt::overrideMediaType() const
 
 void FrameQt::addMessageToConsole(const String& message, unsigned lineNumber, const String& sourceID)
 {
-    notImplemented();
+    qDebug("[FrameQt::addMessageToConsole] message=%s lineNumber=%d sourceID=%s",
+           qPrintable(QString(message)), lineNumber, qPrintable(QString(sourceID)));
 }
 
 bool FrameQt::runJavaScriptPrompt(const String& message, const String& defaultValue, String& result)
@@ -352,6 +353,12 @@ KJS::Bindings::Instance* FrameQt::getAppletInstanceForWidget(Widget*)
     return 0;
 }
 
+KJS::Bindings::RootObject* FrameQt::bindingRootObject()
+{
+    notImplemented();
+    return 0;
+}
+
 void FrameQt::registerCommandForUndo(PassRefPtr<EditCommand>)
 {
     notImplemented();
index 1dee5d471f9db4b401071df5f77301a3d603d9b2..fab40dddfcb0ed2dbb646c54747b45bafbc1c013 100644 (file)
@@ -98,6 +98,7 @@ public:
     virtual KJS::Bindings::Instance* getEmbedInstanceForWidget(Widget*);
     virtual KJS::Bindings::Instance* getObjectInstanceForWidget(Widget*);
     virtual KJS::Bindings::Instance* getAppletInstanceForWidget(Widget*);
+    virtual KJS::Bindings::RootObject* bindingRootObject();
 
     virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
     virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
index 01f3dc32d5a52902ac625042a66fd550c4a14b0d..6aad613e35b9090d1d2780fcc7fcdd4ccd491f3d 100644 (file)
@@ -60,6 +60,8 @@
 #include "RenderTheme.h"
 #include "TextBoundaries.h"
 #include "AXObjectCache.h"
+#include "IconDatabase.h"
+#include "IconLoader.h"
 
 using namespace WebCore;
 
@@ -137,6 +139,14 @@ void PlatformScrollBar::setRect(const IntRect&) { notImplemented(); }
 
 PlatformMouseEvent::PlatformMouseEvent(const CurrentEventTag&) { notImplemented(); }
 
+void IconLoader::stopLoading() { notImplemented(); }
+void IconLoader::startLoading() { notImplemented(); }
+IconLoader* IconLoader::createForFrame(Frame *frame) { return 0; }
+
+bool IconDatabase::isIconExpiredForIconURL(const String& url) { return false; }
+bool IconDatabase::hasEntryForIconURL(const String& url) { return false; }
+IconDatabase* IconDatabase::sharedIconDatabase() { return 0; }
+
 void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
 bool CheckIfReloading(WebCore::DocLoader*) { return false; }
 Vector<char> ServeSynchronousRequest(Loader*, DocLoader*, ResourceLoader*, KURL&, DeprecatedString&) { notImplemented(); return Vector<char>(); }