Reviewed by eseidel.
authorrwlbuis <rwlbuis@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Sep 2006 21:11:21 +0000 (21:11 +0000)
committerrwlbuis <rwlbuis@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Sep 2006 21:11:21 +0000 (21:11 +0000)
        Fix Qt/Linux build.

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

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

index ec41674682b50969a662614fa2cd62cc0c374d65..5764ec92906aecdf9cd4d01abacf1203273eb9af 100644 (file)
@@ -583,6 +583,10 @@ set (SVG_STUFF
     kcanvas/KCanvasCreator.cpp
     kcanvas/KCanvasTreeDebug.cpp
     kcanvas/KCanvasFilters.cpp
+    kcanvas/KCanvasClipper.cpp
+    kcanvas/KCanvasMarker.cpp
+    kcanvas/KCanvasMasker.cpp
+    kcanvas/KCanvasResource.cpp
     kcanvas/RenderSVGText.cpp
     kcanvas/device/KRenderingPaintServerGradient.cpp
     kcanvas/device/KRenderingPaintServerSolid.cpp
@@ -601,7 +605,6 @@ set (SVG_STUFF
 #   kcanvas/device/qt/KCanvasImageItemQt.cpp
     kcanvas/RenderSVGContainer.cpp
     kcanvas/RenderPath.cpp
-    kcanvas/KCanvasResources.cpp
     kcanvas/RenderSVGImage.cpp
     kcanvas/RenderForeignObject.cpp
  )
index a6eb2176f4b4390107799026a040caeaaebb4dbe..a6e30407039224ab350defa4d2385b3f0b5866de 100644 (file)
@@ -1,3 +1,23 @@
+2006-09-21  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by eseidel.
+
+        Fix Qt/Linux build.
+
+        * CMakeLists.txt:
+        * kcanvas/device/qt/KCanvasClipperQt.h:
+        * kcanvas/device/qt/KRenderingDeviceQt.cpp:
+        * platform/qt/FrameQt.cpp:
+        (WebCore::FrameQt::isLoadTypeReload):
+        (WebCore::FrameQt::originalRequestURL):
+        * platform/qt/FrameQt.h:
+        * platform/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::concatCTM):
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::wheelEvent):
+        * platform/qt/TemporaryLinkStubs.cpp:
+        (WebCore::IconDatabase::setIconURLForPageURL):
+
 2006-09-20  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by john
index 122d76cdbc422c3046680a85c53c0108ea838363..c6ca97cbb1972a005e8be8b0f7939018fbe2d48f 100644 (file)
@@ -221,6 +221,12 @@ bool FrameQt::passMouseDownEventToWidget(Widget*)
     return false;
 }
 
+bool FrameQt::isLoadTypeReload()
+{
+    notImplemented();
+    return false;
+}
+
 bool FrameQt::menubarVisible()
 {
     notImplemented();
@@ -472,6 +478,12 @@ bool FrameQt::shouldInterruptJavaScript()
     return false;
 }
 
+KURL FrameQt::originalRequestURL() const
+{
+    notImplemented();
+    return KURL();
+}
+
 bool FrameQt::keyEvent(const PlatformKeyboardEvent& keyEvent)
 {
     bool result;
index fab40dddfcb0ed2dbb646c54747b45bafbc1c013..9d34dbab798242f0cb8b0dc0fd57c0b3c1e8aa64 100644 (file)
@@ -123,6 +123,7 @@ public:
     virtual bool canUndo() const;
     virtual void print();
     virtual bool shouldInterruptJavaScript();
+    virtual KURL originalRequestURL() const;
 
     bool keyEvent(const PlatformKeyboardEvent& keyEvent);
 
@@ -130,6 +131,8 @@ public:
 
 private:
     void init();
+
+    virtual bool isLoadTypeReload();
     virtual bool passMouseDownEventToWidget(Widget*);
 
     FrameQtClient* m_client;
index 18a8006ff5917eb9fb9420fc05f877520b0974bc..d8877d8bd3f902634bfe1d60e2629957f860d020 100644 (file)
@@ -763,6 +763,14 @@ void GraphicsContext::addRoundedRectClip(const IntRect& rect, const IntSize& top
     m_data->p().setClipPath(path, Qt::IntersectClip);
 }
 
+void GraphicsContext::concatCTM(const AffineTransform& transform)
+{
+    if (paintingDisabled())
+        return;
+
+    m_data->p().setMatrix(transform, true);
+}
+
 #if SVG_SUPPORT
 KRenderingDeviceContext* GraphicsContext::createRenderingDeviceContext()
 {
index 1707876498df2f0b92425d5a09574d4de62a8b2d..3277ed3661fa64f81b364a433fd34c26ca5d4077 100644 (file)
@@ -258,6 +258,11 @@ bool ScrollView::inWindow() const
     return true;
 }
 
+void ScrollView::wheelEvent(PlatformWheelEvent&)
+{
+    notImplemented();
+}
+
 }
 
 // vim: ts=4 sw=4 et
index 6aad613e35b9090d1d2780fcc7fcdd4ccd491f3d..b86a589ca0fb367b47f770bafd8be0e424cdba67 100644 (file)
@@ -146,6 +146,7 @@ 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; }
+bool IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL) { return false; }
 
 void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
 bool CheckIfReloading(WebCore::DocLoader*) { return false; }