2006-10-31 Zack Rusin <zack@kde.org>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Oct 2006 11:47:47 +0000 (11:47 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Oct 2006 11:47:47 +0000 (11:47 +0000)
        Reviewed by Mitz.

        Fix the Qt build after last nights changes.

        * platform/qt/FrameQt.cpp:
        * platform/qt/EditorClientQt.h:
        * platform/qt/EditorClientQt.cpp:
        * platform/graphics/svg/qt/SVGResourceImageQt.cpp:
        * platform/graphics/svg/qt/SVGResourceClipperQt.cpp:
        * CMakeLists.txt:
        * kcanvas/device/qt/KRenderingDeviceQt.cpp:
2006-10-31  Zack Rusin  <zack@kde.org>

        Reviewed by Mitz.

        Fix the Qt build after last nights changes.

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

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

WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/kcanvas/device/qt/KRenderingDeviceQt.cpp
WebCore/platform/graphics/svg/qt/SVGResourceClipperQt.cpp
WebCore/platform/graphics/svg/qt/SVGResourceImageQt.cpp
WebCore/platform/qt/EditorClientQt.cpp
WebCore/platform/qt/EditorClientQt.h
WebCore/platform/qt/FrameQt.cpp
WebKitQt/ChangeLog
WebKitQt/QtLauncher/CMakeLists.txt
WebKitQt/WebKitPart/CMakeLists.txt

index c9bb837981c381e6b581189e9754edf426bdd328..c4cba67deff6f310eb3fb85cfd22bee611224299 100644 (file)
@@ -38,6 +38,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/network/qt
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/graphics
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/graphics/qt
+   ${CMAKE_CURRENT_SOURCE_DIR}/platform/graphics/svg
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/image-decoders
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/image-decoders/gif
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/image-decoders/jpeg
@@ -1059,9 +1060,6 @@ set(WebCore_SRCS
     platform/qt/ScrollViewCanvasQt.cpp
     platform/qt/PlatformMouseEventQt.cpp
     platform/qt/PlatformKeyboardEventQt.cpp
-    platform/network/ResourceLoader.cpp
-    platform/network/qt/ResourceLoaderManager.cpp
-    platform/network/qt/ResourceLoaderQt.cpp
     platform/graphics/GraphicsTypes.cpp
     platform/graphics/GraphicsContext.cpp
     platform/graphics/svg/SVGResource.cpp
index 8dc230d3b29e98a8286ef2ee7de19294b6db2384..7df04d8f0ccb3438412b8a2588b323e618362c5f 100644 (file)
@@ -1,3 +1,19 @@
+2006-10-31  Zack Rusin  <zack@kde.org>
+
+        Reviewed by Mitz.
+
+        Fix the Qt build after last nights changes.
+
+        * WebCore/platform/qt/FrameQt.cpp:
+        * WebCore/platform/qt/EditorClientQt.h:
+        * WebCore/platform/qt/EditorClientQt.cpp:
+        * WebCore/platform/graphics/svg/qt/SVGResourceImageQt.cpp:
+        * WebCore/platform/graphics/svg/qt/SVGResourceClipperQt.cpp:
+        * WebCore/CMakeLists.txt:
+        * WebCore/kcanvas/device/qt/KRenderingDeviceQt.cpp:
+        * WebKitQt/QtLauncher/CMakeLists.txt:
+        * WebKitQt/WebKitPart/CMakeLists.txt:
+
 2006-10-30  Darin Adler  <darin@apple.com>
 
         Reviewed by Anders.
index a1d208b15052379e6e2ffbed22212b608aa4a42f..fe0a3d2eaab20be0e31ab9cca555014fc1823c3e 100644 (file)
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include "IntRect.h"
-#include "RenderPathQt.h"
+#include "RenderPath.h"
 #include "AffineTransform.h"
 #include "GraphicsContext.h"
 #include "SVGResourceClipper.h"
index 79c87e626ef41c39cb157e1dc669b5c1fe8c7cdf..e5a71b8d3be1b6b60d412dd96a449a63d82b64ef 100644 (file)
@@ -46,125 +46,7 @@ void SVGResourceClipper::applyClip(const FloatRect& boundingBox) const
         ClipData clipData = m_clipData[x];
         if (clipData.windRule != clipRule)
             heterogenousClipRules = true;
-       
-        QPainterPath path = *(clipData.path.platformPath());
-        if (path.isEmpty())
-            continue;
-
-        if (!newPath.isEmpty())
-            newPath.closeSubpath();
 
-        // Respect clipping units...
-        QMatrix transform;
-
-        if (clipData.bboxUnits) {
-            transform.translate(boundingBox.x(), boundingBox.y());
-            transform.scale(boundingBox.width(), boundingBox.height());
-        }
-
-        // TODO: support heterogenous clip rules!
-        //clipRule = (clipData.windRule() == RULE_EVENODD ? Qt::OddEvenFill : Qt::WindingFill);
-
-        for (int i = 0; i < path.elementCount(); ++i) {
-            const QPainterPath::Element &cur = path.elementAt(i);
-
-            switch (cur.type) {
-                case QPainterPath::MoveToElement:
-                    newPath.moveTo(QPointF(cur.x, cur.y) * transform);
-                    break;
-                case QPainterPath::LineToElement:
-                    newPath.lineTo(QPointF(cur.x, cur.y) * transform);
-                    break;
-                case QPainterPath::CurveToElement:
-                {
-                    const QPainterPath::Element &c1 = path.elementAt(i + 1);
-                    const QPainterPath::Element &c2 = path.elementAt(i + 2);
-
-                    Q_ASSERT(c1.type == QPainterPath::CurveToDataElement);
-                    Q_ASSERT(c2.type == QPainterPath::CurveToDataElement);
-
-                    newPath.cubicTo(QPointF(cur.x, cur.y) * transform,
-                                    QPointF(c1.x, c1.y) * transform,
-                                    QPointF(c2.x, c2.y) * transform);
-
-                    i += 2;
-                    break;
-                }
-                case QPainterPath::CurveToDataElement:
-                    Q_ASSERT(false);
-                    break;
-            }
-        }
-    }
-
-    if (m_clipData.count()) {
-        // FIXME!
-        // We don't currently allow for heterogenous clip rules.
-        // we would have to detect such, draw to a mask, and then clip
-        // to that mask
-        // if (!CGContextIsPathEmpty(cgContext)) {
-            if (clipRule == RULE_EVENODD)
-                newPath.setFillRule(Qt::OddEvenFill);
-            else
-                newPath.setFillRule(Qt::WindingFill);
-        // }
-    }
-
-    qtContext->painter().setClipPath(newPath);
-}
-
-} // namespace WebCore
-
-// vim:ts=4:noet
-/*
-    Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005, 2006 Rob Buis <buis@kde.org>
-                  2005 Apple Computer, Inc.
-
-    This file is part of the KDE project
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    aint with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-*/
-
-#include "config.h"
-
-#include "KCanvasClipperQt.h"
-#include "KRenderingDeviceQt.h"
-
-namespace WebCore {
-
-void KCanvasClipperQt::applyClip(const FloatRect& boundingBox) const
-{
-    KRenderingDeviceContext* context = renderingDevice()->currentContext();
-    KRenderingDeviceContextQt* qtContext = static_cast<KRenderingDeviceContextQt*>(context);
-    if (m_clipData.count() < 1)
-        return;
-
-    context->clearPath();
-
-    QPainterPath newPath;
-
-    bool heterogenousClipRules = false;
-    WindRule clipRule = m_clipData[0].windRule();
-
-    for (unsigned int x = 0; x < m_clipData.count(); x++) {
-        KCClipData clipData = m_clipData[x];
-        if (clipData.windRule() != clipRule)
-            heterogenousClipRules = true;
-       
         QPainterPath path = *(clipData.path.platformPath());
         if (path.isEmpty())
             continue;
@@ -231,6 +113,6 @@ void KCanvasClipperQt::applyClip(const FloatRect& boundingBox) const
     qtContext->painter().setClipPath(newPath);
 }
 
-}
+} // namespace WebCore
 
 // vim:ts=4:noet
index 83b8bf71380c541df44dc3dde6174ef3159f83e0..3fcdbe394e8f35d121add93df23379ff25521cd2 100644 (file)
@@ -27,6 +27,9 @@
 namespace WebCore {
 
 // FIXME: For now we only stub this methods!
+SVGResourceImage::SVGResourceImage()
+{
+}
 
 void SVGResourceImage::init(const Image&)
 {
index c4ee49db6496b7c1c16e3c37fdafd8b93e5c9b51..cf3abc90fb20f51e206818f1e68d34920004edee 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.
- * 
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,24 @@ bool EditorClientQt::shouldShowDeleteInterface(HTMLElement*)
     return false;
 }
 
+bool EditorClientQt::isContinuousSpellCheckingEnabled()
+{
+    notImplemented();
+    return false;
+}
+
+bool EditorClientQt::isGrammarCheckingEnabled()
+{
+    notImplemented();
+    return false;
+}
+
+int EditorClientQt::spellCheckerDocumentTag()
+{
+    notImplemented();
+    return 0;
+}
+
 }
 
 // vim: ts=4 sw=4 et
index 536b2c7803c5bafa709a253520145aac830fa3f0..8411a9ab56bfdd2d94bfd8e368a6128d6c6f0aeb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.
- * 
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,10 @@ class EditorClientQt : public EditorClient {
 public:
     virtual bool shouldDeleteRange(Range*);
     virtual bool shouldShowDeleteInterface(HTMLElement*);
+
+    virtual bool isContinuousSpellCheckingEnabled();
+    virtual bool isGrammarCheckingEnabled();
+    virtual int spellCheckerDocumentTag();
 };
 
 }
index 55a4e54d200eb131cccdcff10f552994e1e375bc..ff02fec4ed811db3cd3801856c2ec678e5593dc0 100644 (file)
@@ -104,7 +104,7 @@ FrameQt::FrameQt(Page* page, Element* ownerElement, FrameQtClient* frameClient,
     settings->setMinLogicalFontSize(5);
     settings->setShouldPrintBackgrounds(true);
     settings->setIsJavaScriptEnabled(true);
+
     settings->setMediumFixedFontSize(14);
     settings->setMediumFontSize(14);
     settings->setSerifFontName("Times New Roman");
@@ -128,7 +128,7 @@ FrameQt::~FrameQt()
 
 void FrameQt::submitForm(const FrameLoadRequest& frameLoadRequest)
 {
-    ResourceRequest request = frameLoadRequest.m_request;
+    const ResourceRequest& request = frameLoadRequest.resourceRequest();
 
     // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
     if (d->m_submittedFormURL == request.url())
@@ -144,7 +144,7 @@ void FrameQt::submitForm(const FrameLoadRequest& frameLoadRequest)
 
 void FrameQt::urlSelected(const FrameLoadRequest& frameLoadRequest, const Event*)
 {
-    ResourceRequest request = frameLoadRequest.m_request;
+    const ResourceRequest& request = frameLoadRequest.resourceRequest();
 
     if (!m_client)
         return;
@@ -192,7 +192,7 @@ bool FrameQt::passWheelEventToChildWidget(Node*)
 
 bool FrameQt::passSubframeEventToSubframe(MouseEventWithHitTestResults& mev, Frame*)
 {
-    notImplemented(); 
+    notImplemented();
     return false;
 }
 
@@ -380,7 +380,7 @@ void FrameQt::addPluginRootObject(KJS::Bindings::RootObject* root)
 Widget* FrameQt::createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>&)
 {
     notImplemented();
-    return 0; 
+    return 0;
 }
 
 void FrameQt::registerCommandForUndo(PassRefPtr<EditCommand>)
@@ -476,21 +476,21 @@ void FrameQt::handledOnloadEvents()
 
 bool FrameQt::canPaste() const
 {
-    // FIXME: Implement this in the FrameQtClient, to be used within WebKitPart. 
+    // FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
     notImplemented();
     return false;
 }
 
 bool FrameQt::canRedo() const
 {
-    // FIXME: Implement this in the FrameQtClient, to be used within WebKitPart. 
+    // FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
     notImplemented();
     return false;
 }
 
 bool FrameQt::canUndo() const
 {
-    // FIXME: Implement this in the FrameQtClient, to be used within WebKitPart. 
+    // FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
     notImplemented();
     return false;
 }
@@ -563,12 +563,12 @@ void FrameQt::createNewWindow(const FrameLoadRequest& request, const WindowFeatu
     notImplemented();
 }
 
-void FrameQt::goBackOrForward(int) 
+void FrameQt::goBackOrForward(int)
 {
     notImplemented();
 }
 
-KURL FrameQt::historyURL(int distance) 
+KURL FrameQt::historyURL(int distance)
 {
     notImplemented();
     return KURL();
index c0cbf9ae92c2e408cbab6135a9b205a4707d62c0..42f2bbbaa4a039dad577029815b4b29f325de1bf 100644 (file)
@@ -1,3 +1,12 @@
+2006-10-31  Zack Rusin  <zack@kde.org>
+
+        Reviewed by Mitz.
+
+        Fix the Qt build after last nights changes.
+
+        * QtLauncher/CMakeLists.txt:
+        * WebKitPart/CMakeLists.txt:
+
 2006-10-26  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Darin.
index b12a3b07b708a16e634ee9d3dc810eb92ce46328..8168d03258065780deb8d2f58810e99e65c3bc78 100644 (file)
@@ -5,6 +5,8 @@ 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/graphics
+   BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/graphics/svg
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/network
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/qt
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2
index 1c92d8eb4f9e5b42955bff9447baaa5fb1d64f8c..d642bd4ce419d862727d2b9ff8447af3e4df8c03 100644 (file)
@@ -5,6 +5,8 @@ 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/graphics
+   BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/graphics/svg
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/network
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/qt
    BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2