[Qt] Remove Qt specific QTKIT flagged code.
authormichael.bruning@digia.com <michael.bruning@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jun 2013 14:35:05 +0000 (14:35 +0000)
committermichael.bruning@digia.com <michael.bruning@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jun 2013 14:35:05 +0000 (14:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=117635

Reviewed by Simon Hausmann.

Due to disabling QTKIT for Qt in r151546, the
code the flags that are not taken into account
anymore and the code that has been rendered
unreachable by this are removed.

.:

* Source/widgetsapi.pri:

Source/WebCore:

No new tests, no behavioural change.

* Target.pri:
* WebCore.exp.in:
* page/Settings.cpp:
* page/Settings.h:
* platform/KURL.h:
* platform/SharedBuffer.h:
* platform/cf/KURLCFNet.cpp:
(WebCore::KURL::fileSystemPath):
* platform/cf/SharedBufferCF.cpp:
* platform/graphics/FloatSize.h:
* platform/graphics/IntRect.h:
* platform/graphics/IntSize.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::installedMediaEngines):
* platform/graphics/cg/FloatSizeCG.cpp:
* platform/graphics/cg/IntRectCG.cpp:
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::createQTMovieLayer):
(WebCore::MediaPlayerPrivateQTKit::preferredRenderingMode):
(WebCore::MediaPlayerPrivateQTKit::paint):
(-[WebCoreMovieObserver layerHostChanged:]):
* platform/mac/SharedBufferMac.mm:
(+[WebCoreSharedBufferData initialize]):
(WebCore::SharedBuffer::createWithContentsOfFile):

Source/WebKit:

* WebKit1.pro:

Source/WebKit/mac:

* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Source/WebKit/qt:

* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::ChromeClientQt):
(WebCore::ChromeClientQt::~ChromeClientQt):
* WebCoreSupport/ChromeClientQt.h:
* WebCoreSupport/FullScreenVideoQt.cpp:
(WebCore::FullScreenVideoQt::FullScreenVideoQt):
(WebCore::FullScreenVideoQt::~FullScreenVideoQt):
(WebCore::FullScreenVideoQt::enterFullScreenForNode):
(WebCore::FullScreenVideoQt::exitFullScreenForNode):
(WebCore::FullScreenVideoQt::isValid):
* WebCoreSupport/FullScreenVideoQt.h:
* WebCoreSupport/InitWebCoreQt.cpp:
(WebCore::initializeWebCoreQt):
* WebCoreSupport/QTKitFullScreenVideoHandler.h: Removed.
* WebCoreSupport/QTKitFullScreenVideoHandler.mm: Removed.
* WebCoreSupport/WebSystemInterface.h: Removed.
* WebCoreSupport/WebSystemInterface.mm: Removed.

Source/WebKit2:

* Target.pri:
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::platformInitializeWebProcess):
* WebProcess/WebCoreSupport/qt/WebSystemInterface.h: Removed.
* WebProcess/WebCoreSupport/qt/WebSystemInterface.mm: Removed.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/qt/WebProcessMainQt.cpp:
(WebKit::WebProcessMainQt):

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

41 files changed:
ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/Target.pri
Source/WebCore/WebCore.exp.in
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebCore/platform/KURL.h
Source/WebCore/platform/SharedBuffer.h
Source/WebCore/platform/cf/KURLCFNet.cpp
Source/WebCore/platform/cf/SharedBufferCF.cpp
Source/WebCore/platform/graphics/FloatSize.h
Source/WebCore/platform/graphics/IntRect.h
Source/WebCore/platform/graphics/IntSize.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp
Source/WebCore/platform/graphics/cg/IntRectCG.cpp
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
Source/WebCore/platform/mac/SharedBufferMac.mm
Source/WebKit/ChangeLog
Source/WebKit/WebKit1.pro
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.h [deleted file]
Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.mm [deleted file]
Source/WebKit/qt/WebCoreSupport/WebSystemInterface.h [deleted file]
Source/WebKit/qt/WebCoreSupport/WebSystemInterface.mm [deleted file]
Source/WebKit2/ChangeLog
Source/WebKit2/Target.pri
Source/WebKit2/UIProcess/qt/WebContextQt.cpp
Source/WebKit2/WebProcess/WebCoreSupport/qt/WebSystemInterface.h [deleted file]
Source/WebKit2/WebProcess/WebCoreSupport/qt/WebSystemInterface.mm [deleted file]
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
Source/widgetsapi.pri

index bf46b69..1419ff4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-06-17  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Remove Qt specific QTKIT flagged code.
+        https://bugs.webkit.org/show_bug.cgi?id=117635
+
+        Reviewed by Simon Hausmann.
+
+        Due to disabling QTKIT for Qt in r151546, the
+        code the flags that are not taken into account
+        anymore and the code that has been rendered
+        unreachable by this are removed.
+
+        * Source/widgetsapi.pri:
+
 2013-06-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Rename gobject_introspection_required variable.
index 69076ec..7f8ed96 100644 (file)
@@ -1,3 +1,43 @@
+2013-06-17  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Remove Qt specific QTKIT flagged code.
+        https://bugs.webkit.org/show_bug.cgi?id=117635
+
+        Reviewed by Simon Hausmann.
+
+        Due to disabling QTKIT for Qt in r151546, the
+        code the flags that are not taken into account
+        anymore and the code that has been rendered
+        unreachable by this are removed.
+
+        No new tests, no behavioural change.
+
+        * Target.pri:
+        * WebCore.exp.in:
+        * page/Settings.cpp:
+        * page/Settings.h:
+        * platform/KURL.h:
+        * platform/SharedBuffer.h:
+        * platform/cf/KURLCFNet.cpp:
+        (WebCore::KURL::fileSystemPath):
+        * platform/cf/SharedBufferCF.cpp:
+        * platform/graphics/FloatSize.h:
+        * platform/graphics/IntRect.h:
+        * platform/graphics/IntSize.h:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines):
+        * platform/graphics/cg/FloatSizeCG.cpp:
+        * platform/graphics/cg/IntRectCG.cpp:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::createQTMovieLayer):
+        (WebCore::MediaPlayerPrivateQTKit::preferredRenderingMode):
+        (WebCore::MediaPlayerPrivateQTKit::paint):
+        (-[WebCoreMovieObserver layerHostChanged:]):
+        * platform/mac/SharedBufferMac.mm:
+        (+[WebCoreSharedBufferData initialize]):
+        (WebCore::SharedBuffer::createWithContentsOfFile):
+
 2013-06-17  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         REGRESSSION(r151632) : Build error on ASSERT(WTF_USE_GRAMMAR_CHECKING)
index 07ba8bd..bf6e82e 100644 (file)
@@ -3310,52 +3310,7 @@ enable?(VIDEO) {
         rendering/RenderMediaControls.cpp \
         rendering/RenderMediaControlElements.cpp
 
-    use?(QTKIT) {
-        INCLUDEPATH += \
-            $$SOURCE_DIR/../WebKitLibraries/ \
-            $$PWD/platform/mac \
-            $$PWD/platform/cf
-
-
-        HEADERS += \
-            platform/graphics/mac/MediaPlayerPrivateQTKit.h \
-            platform/mac/WebCoreObjCExtras.h \
-            platform/qt/WebCoreSystemInterface.h \
-            platform/mac/BlockExceptions.h \
-            platform/mac/WebCoreObjCExtras.h \
-            platform/mac/WebVideoFullscreenController.h \
-            platform/mac/WebVideoFullscreenHUDWindowController.h \
-            platform/mac/WebWindowAnimation.h \
-            platform/cf/CFURLExtras.h
-
-        SOURCES += \
-            platform/mac/DisplaySleepDisabler.cpp \
-            platform/graphics/cg/IntRectCG.cpp \
-            platform/graphics/cg/FloatSizeCG.cpp \
-            platform/cf/KURLCFNet.cpp \
-            platform/cf/CFURLExtras.cpp
-
-         OBJECTIVE_SOURCES += \
-            platform/qt/WebCoreSystemInterface.mm \
-            platform/mac/BlockExceptions.mm \
-            platform/mac/WebCoreObjCExtras.mm \
-            platform/graphics/mac/MediaPlayerPrivateQTKit.mm \
-            platform/mac/SharedBufferMac.mm \
-            platform/mac/KURLMac.mm \
-            platform/text/mac/StringMac.mm \
-            platform/text/mac/StringImplMac.mm \
-            platform/graphics/mac/FloatSizeMac.mm \
-            platform/graphics/mac/IntRectMac.mm \
-            platform/mac/WebVideoFullscreenController.mm \
-            platform/mac/WebVideoFullscreenHUDWindowController.mm \
-            platform/mac/WebWindowAnimation.mm
-
-        DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
-        isEqual(QT_ARCH, "i386") {
-            DEFINES+=NS_BUILD_32_LIKE_64
-        }
-
-    } else: use?(GSTREAMER) {
+    use?(GSTREAMER) {
         HEADERS += \
             platform/graphics/gstreamer/GStreamerGWorld.h \
             platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h \
index 5c6bcc9..6a1a94a 100644 (file)
@@ -2371,7 +2371,7 @@ __ZN7WebCore8Settings20gAVFoundationEnabledE
 __ZN7WebCore8Settings22setAVFoundationEnabledEb
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 __ZN7WebCore8Settings13gQTKitEnabledE
 __ZN7WebCore8Settings15setQTKitEnabledEb
 #endif
index 38a0890..4dce1c9 100644 (file)
@@ -77,7 +77,7 @@ bool Settings::gShouldPaintNativeControls = true;
 bool Settings::gAVFoundationEnabled = false;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 bool Settings::gQTKitEnabled = true;
 #endif
 
@@ -537,7 +537,7 @@ void Settings::setAVFoundationEnabled(bool enabled)
 }
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 void Settings::setQTKitEnabled(bool enabled)
 {
     if (gQTKitEnabled == enabled)
index d68a642..51fa856 100644 (file)
@@ -214,7 +214,7 @@ namespace WebCore {
         static bool isAVFoundationEnabled() { return gAVFoundationEnabled; }
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
         static void setQTKitEnabled(bool flag);
         static bool isQTKitEnabled() { return gQTKitEnabled; }
 #endif
@@ -323,7 +323,7 @@ namespace WebCore {
         static bool gAVFoundationEnabled;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
         static bool gQTKitEnabled;
 #endif
         
index 0f97ff8..07a4931 100644 (file)
@@ -35,7 +35,7 @@
 typedef const struct __CFURL* CFURLRef;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 OBJC_CLASS NSURL;
 #endif
 
@@ -171,7 +171,7 @@ public:
     RetainPtr<CFURLRef> createCFURL() const;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
     KURL(NSURL*);
     operator NSURL*() const;
 #endif
index 7b03566..4c312f9 100644 (file)
@@ -37,7 +37,7 @@
 #include <wtf/RetainPtr.h>
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 OBJC_CLASS NSData;
 #endif
 
@@ -62,7 +62,7 @@ public:
     
     ~SharedBuffer();
     
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
     NSData *createNSData();
     static PassRefPtr<SharedBuffer> wrapNSData(NSData *data);
 #endif
index 3da0390..81b7cfe 100644 (file)
@@ -47,7 +47,7 @@ KURL::KURL(CFURLRef url)
     parse(urlBytes.data());
 }
 
-#if !PLATFORM(MAC) && !(PLATFORM(QT) && USE(QTKIT))
+#if !PLATFORM(MAC)
 RetainPtr<CFURLRef> KURL::createCFURL() const
 {
     // FIXME: What should this return for invalid URLs?
@@ -59,7 +59,6 @@ RetainPtr<CFURLRef> KURL::createCFURL() const
 }
 #endif
 
-#if !(PLATFORM(QT) && USE(QTKIT))
 String KURL::fileSystemPath() const
 {
     RetainPtr<CFURLRef> cfURL = createCFURL();
@@ -73,6 +72,5 @@ String KURL::fileSystemPath() const
 #endif
     return adoptCF(CFURLCopyFileSystemPath(cfURL.get(), pathStyle)).get();
 }
-#endif
 
 }
index 6e12eeb..188a837 100644 (file)
@@ -40,7 +40,7 @@ SharedBuffer::SharedBuffer(CFDataRef cfData)
 
 // Mac is a CF platform but has an even more efficient version of this method,
 // so only use this version for non-Mac
-#if !PLATFORM(MAC) && !(PLATFORM(QT) && USE(QTKIT))
+#if !PLATFORM(MAC)
 CFDataRef SharedBuffer::createCFData()
 {
     if (m_cfData) {
index d0cf1d3..77ee3e2 100644 (file)
@@ -49,7 +49,7 @@ class FloatSize;
 typedef struct CGSize CGSize;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGSize NSSize;
 #else
@@ -135,7 +135,7 @@ public:
     operator CGSize() const;
 #endif
 
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
     explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
     operator NSSize() const;
 #endif
index c01cab9..0e33bbf 100644 (file)
@@ -33,7 +33,7 @@
 typedef struct CGRect CGRect;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGRect NSRect;
 #else
@@ -199,7 +199,7 @@ public:
     operator CGRect() const;
 #endif
 
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
     operator NSRect() const;
 #endif
 
@@ -243,7 +243,7 @@ inline bool operator!=(const IntRect& a, const IntRect& b)
 IntRect enclosingIntRect(const CGRect&);
 #endif
 
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
 IntRect enclosingIntRect(const NSRect&);
 #endif
 
index 9c26c24..b843507 100644 (file)
@@ -30,7 +30,7 @@
 typedef struct CGSize CGSize;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGSize NSSize;
 #else
@@ -133,7 +133,7 @@ public:
     operator CGSize() const;
 #endif
 
-#if (PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     explicit IntSize(const NSSize &); // don't do this implicitly since it's lossy
     operator NSSize() const;
 #endif
index 017465f..3b0d63f 100644 (file)
@@ -57,7 +57,7 @@
 #define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
 #include "MediaPlayerPrivateQTKit.h"
 #if USE(AVFOUNDATION)
 #include "MediaPlayerPrivateAVFoundationObjC.h"
@@ -223,7 +223,7 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines(RequeryEngineOptions r
         }
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
         if (Settings::isQTKitEnabled())
             MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
 #endif
index 0f5bc73..14e14fc 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "FloatSize.h"
 
-#if USE(CG) || (PLATFORM(QT) && USE(QTKIT))
+#if USE(CG)
 
 #include <ApplicationServices/ApplicationServices.h>
 
index f1ccde4..8d10207 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "IntRect.h"
 
-#if USE(CG) || (PLATFORM(QT) && USE(QTKIT))
+#if USE(CG)
 
 #include <ApplicationServices/ApplicationServices.h>
 
index 8b11f83..f226cda 100644 (file)
@@ -86,7 +86,7 @@ private:
     static bool isAvailable();
 
     PlatformMedia platformMedia() const;
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
     PlatformLayer* platformLayer() const;
 #endif
 
@@ -139,7 +139,7 @@ private:
     virtual void prepareForRendering();
 
 
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
     bool supportsAcceleratedRendering() const;
     void acceleratedRenderingStateChanged();
 #endif
index e965965..ab073a9 100644 (file)
@@ -519,7 +519,7 @@ void MediaPlayerPrivateQTKit::destroyQTVideoRenderer()
 void MediaPlayerPrivateQTKit::createQTMovieLayer()
 {
     LOG(Media, "MediaPlayerPrivateQTKit::createQTMovieLayer(%p)", this);
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
     if (!m_qtMovie)
         return;
 
@@ -571,7 +571,7 @@ MediaPlayerPrivateQTKit::MediaRenderingMode MediaPlayerPrivateQTKit::preferredRe
     if (!m_player->frameView() || !m_qtMovie)
         return MediaRenderingNone;
 
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
     if (supportsAcceleratedRendering() && m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player))
         return MediaRenderingMovieLayer;
 #endif
@@ -693,7 +693,7 @@ PlatformMedia MediaPlayerPrivateQTKit::platformMedia() const
     return pm;
 }
 
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* MediaPlayerPrivateQTKit::platformLayer() const
 {
     return m_qtVideoLayer.get();
@@ -1227,7 +1227,7 @@ void MediaPlayerPrivateQTKit::didEnd()
     m_player->timeChanged();
 }
 
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
 static bool layerIsDescendentOf(PlatformLayer* child, PlatformLayer* descendent)
 {
@@ -1331,18 +1331,6 @@ void MediaPlayerPrivateQTKit::paintCurrentFrameInContext(GraphicsContext* contex
     paint(context, r);
 }
 
-#if PLATFORM(QT) && USE(QTKIT)
-static inline void swapBgrToRgb(uint32_t* pixel, uint32_t width, uint32_t height)
-{
-    uint32_t* end = pixel + (width * height);
-
-    while (pixel < end) {
-        *pixel = ((*pixel << 16) & 0xff0000) | ((*pixel >> 16) & 0xff) | (*pixel & 0xff00ff00);
-        ++pixel;
-    }
-}
-#endif
-
 void MediaPlayerPrivateQTKit::paint(GraphicsContext* context, const IntRect& r)
 {
     if (context->paintingDisabled() || m_hasUnsupportedTracks)
@@ -1358,26 +1346,13 @@ void MediaPlayerPrivateQTKit::paint(GraphicsContext* context, const IntRect& r)
     FloatSize scaleFactor(1.0f, -1.0f);
     IntRect paintRect(IntPoint(0, 0), IntSize(r.width(), r.height()));
 
-#if PLATFORM(QT) && USE(QTKIT)
-    NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes: NULL
-                                                            pixelsWide: paintRect.width()
-                                                            pixelsHigh: paintRect.height()
-                                                            bitsPerSample: 8
-                                                            samplesPerPixel: 4
-                                                            hasAlpha: YES
-                                                            isPlanar: NO
-                                                            colorSpaceName: NSCalibratedRGBColorSpace
-                                                            bytesPerRow: 4 * paintRect.width() // 32 bit per pixel.
-                                                            bitsPerPixel: 32];
-    newContext = [NSGraphicsContext graphicsContextWithBitmapImageRep: imageRep];
-#else
     GraphicsContextStateSaver stateSaver(*context);
     context->translate(r.x(), r.y() + r.height());
     context->scale(scaleFactor);
     context->setImageInterpolationQuality(InterpolationLow);
 
     newContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context->platformContext() flipped:NO];
-#endif
+
     // draw the current video frame
     if (qtVideoRenderer) {
         [NSGraphicsContext saveGraphicsState];
@@ -1431,14 +1406,6 @@ void MediaPlayerPrivateQTKit::paint(GraphicsContext* context, const IntRect& r)
         }
     }
 #endif
-#if PLATFORM(QT) && USE(QTKIT)
-    unsigned char* bitmap = [imageRep bitmapData];
-    swapBgrToRgb(reinterpret_cast<uint32_t*>(bitmap), paintRect.width(), paintRect.height());
-    QImage videoFrame(bitmap, paintRect.width(), paintRect.height(), QImage::Format_ARGB32);
-    QPainter* painter = context->platformContext();
-    painter->drawImage(QRect(r), videoFrame);
-    [imageRep release];
-#endif
     END_BLOCK_OBJC_EXCEPTIONS;
     [m_objcObserver.get() setDelayCallbacks:NO];
 }
@@ -1674,7 +1641,7 @@ void MediaPlayerPrivateQTKit::sawUnsupportedTracks()
     m_player->mediaPlayerClient()->mediaPlayerSawUnsupportedTracks(m_player);
 }
 
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
 bool MediaPlayerPrivateQTKit::supportsAcceleratedRendering() const
 {
     return isReadyForVideoSetup() && getQTMovieLayerClass() != Nil;
@@ -1837,7 +1804,7 @@ void MediaPlayerPrivateQTKit::setPrivateBrowsingMode(bool privateBrowsing)
 
 - (void)layerHostChanged:(NSNotification *)notification
 {
-#if USE(ACCELERATED_COMPOSITING) && !(PLATFORM(QT) && USE(QTKIT))
+#if USE(ACCELERATED_COMPOSITING)
     CALayer* rootLayer = static_cast<CALayer*>([notification object]);
     m_callback->layerHostChanged(rootLayer);
 #else
index 941475b..715caae 100644 (file)
@@ -49,11 +49,7 @@ using namespace WebCore;
 {
 #if !USE(WEB_THREAD)
     JSC::initializeThreading();
-#if PLATFORM(QT) && USE(QTKIT)
-    WTF::initializeMainThread();
-#else
     WTF::initializeMainThreadToProcessMainThread();
-#endif
 #endif // !USE(WEB_THREAD)
     WebCoreObjCFinalizeOnMainThread(self);
 }
@@ -115,7 +111,6 @@ CFDataRef SharedBuffer::createCFData()
     return (CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBuffer:this]).leakRef();
 }
 
-#if !(PLATFORM(QT) && USE(QTKIT))
 PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath)
 {
     NSData *resourceData = [NSData dataWithContentsOfFile:filePath];
@@ -123,6 +118,5 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& fi
         return SharedBuffer::wrapNSData(resourceData);
     return 0;
 }
-#endif
 
 }
index e2aef01..301a09b 100644 (file)
@@ -1,3 +1,17 @@
+2013-06-17  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Remove Qt specific QTKIT flagged code.
+        https://bugs.webkit.org/show_bug.cgi?id=117635
+
+        Reviewed by Simon Hausmann.
+
+        Due to disabling QTKIT for Qt in r151546, the
+        code the flags that are not taken into account
+        anymore and the code that has been rendered
+        unreachable by this are removed.
+
+        * WebKit1.pro:
+
 2013-06-14  Alberto Garcia  <agarcia@igalia.com>
 
         [BlackBerry] Remove implementation of ContextMenu classes
index 7fbf941..be04ca3 100644 (file)
@@ -115,30 +115,10 @@ enable?(ICONDATABASE) {
 }
 
 enable?(VIDEO) {
-    use?(QTKIT) | use?(GSTREAMER) | use?(QT_MULTIMEDIA) {
+    use?(GSTREAMER) | use?(QT_MULTIMEDIA) {
         HEADERS += $$PWD/qt/WebCoreSupport/FullScreenVideoQt.h
         SOURCES += $$PWD/qt/WebCoreSupport/FullScreenVideoQt.cpp
     }
-
-    use?(QTKIT) {
-        INCLUDEPATH += \
-            $$PWD/../WebCore/platform/qt/ \
-            $$PWD/../WebCore/platform/mac/ \
-            $$PWD/../../WebKitLibraries/
-
-        DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
-        isEqual(QT_ARCH, "i386") {
-            DEFINES+=NS_BUILD_32_LIKE_64
-        }
-
-        HEADERS += \
-            $$PWD/qt/WebCoreSupport/WebSystemInterface.h \
-            $$PWD/qt/WebCoreSupport/QTKitFullScreenVideoHandler.h
-
-        OBJECTIVE_SOURCES += \
-            $$PWD/qt/WebCoreSupport/WebSystemInterface.mm \
-            $$PWD/qt/WebCoreSupport/QTKitFullScreenVideoHandler.mm
-    }
 }
 
 
index d452969..7a44866 100644 (file)
@@ -1,3 +1,18 @@
+2013-06-17  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Remove Qt specific QTKIT flagged code.
+        https://bugs.webkit.org/show_bug.cgi?id=117635
+
+        Reviewed by Simon Hausmann.
+
+        Due to disabling QTKIT for Qt in r151546, the
+        code the flags that are not taken into account
+        anymore and the code that has been rendered
+        unreachable by this are removed.
+
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2013-06-17  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 
         Unreviewed, rolling out r151632.
index f6cf29e..aa9fc24 100644 (file)
@@ -1525,7 +1525,7 @@ static bool needsSelfRetainWhileLoadingQuirk()
 #if USE(AVFOUNDATION)
     settings->setAVFoundationEnabled([preferences isAVFoundationEnabled]);
 #endif
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
     settings->setQTKitEnabled([preferences isQTKitEnabled]);
 #endif
     settings->setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
index 0039df6..a4fd5bd 100644 (file)
@@ -1,3 +1,33 @@
+2013-06-17  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Remove Qt specific QTKIT flagged code.
+        https://bugs.webkit.org/show_bug.cgi?id=117635
+
+        Reviewed by Simon Hausmann.
+
+        Due to disabling QTKIT for Qt in r151546, the
+        code the flags that are not taken into account
+        anymore and the code that has been rendered
+        unreachable by this are removed.
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::ChromeClientQt):
+        (WebCore::ChromeClientQt::~ChromeClientQt):
+        * WebCoreSupport/ChromeClientQt.h:
+        * WebCoreSupport/FullScreenVideoQt.cpp:
+        (WebCore::FullScreenVideoQt::FullScreenVideoQt):
+        (WebCore::FullScreenVideoQt::~FullScreenVideoQt):
+        (WebCore::FullScreenVideoQt::enterFullScreenForNode):
+        (WebCore::FullScreenVideoQt::exitFullScreenForNode):
+        (WebCore::FullScreenVideoQt::isValid):
+        * WebCoreSupport/FullScreenVideoQt.h:
+        * WebCoreSupport/InitWebCoreQt.cpp:
+        (WebCore::initializeWebCoreQt):
+        * WebCoreSupport/QTKitFullScreenVideoHandler.h: Removed.
+        * WebCoreSupport/QTKitFullScreenVideoHandler.mm: Removed.
+        * WebCoreSupport/WebSystemInterface.h: Removed.
+        * WebCoreSupport/WebSystemInterface.mm: Removed.
+
 2013-06-05  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         [Qt] Handle Return key without key text
index a61fa27..aba037c 100644 (file)
@@ -76,7 +76,7 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/OwnPtr.h>
 
-#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
 #include "FullScreenVideoQt.h"
 #include "HTMLMediaElement.h"
 #include "HTMLNames.h"
@@ -127,7 +127,7 @@ bool ChromeClientQt::dumpVisitedLinksCallbacks = false;
 ChromeClientQt::ChromeClientQt(QWebPageAdapter* webPageAdapter)
     : m_webPage(webPageAdapter)
     , m_eventLoop(0)
-#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
     , m_fullScreenVideo(0)
 #endif
 {
@@ -139,7 +139,7 @@ ChromeClientQt::~ChromeClientQt()
     if (m_eventLoop)
         m_eventLoop->exit();
 
-#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
     delete m_fullScreenVideo;
 #endif
 }
@@ -679,7 +679,7 @@ IntRect ChromeClientQt::visibleRectForTiledBackingStore() const
 }
 #endif
 
-#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
 FullScreenVideoQt* ChromeClientQt::fullScreenVideo()
 {
     if (!m_fullScreenVideo)
index 967edd2..8f2db26 100644 (file)
@@ -159,7 +159,7 @@ public:
     virtual void needTouchEvents(bool) { }
 #endif
 
-#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
     virtual bool supportsFullscreenForNode(const Node*);
     virtual void enterFullscreenForNode(Node*);
     virtual void exitFullscreenForNode(Node*);
@@ -215,7 +215,7 @@ public:
     OwnPtr<RefreshAnimation> m_refreshAnimation;
 #endif
 
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA))
     FullScreenVideoQt* m_fullScreenVideo;
 #endif
 
index 86d354e..4f03a64 100644 (file)
 #include "PlatformVideoWindowPrivate.h"
 #endif
 
-#if USE(QTKIT)
-#include "QTKitFullScreenVideoHandler.h"
-#endif
-
 #if USE(QT_MULTIMEDIA)
 #include <QMediaPlayer>
 #endif
@@ -102,10 +98,6 @@ FullScreenVideoQt::FullScreenVideoQt(ChromeClientQt* chromeClient)
 #if USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)
     m_FullScreenVideoHandlerGStreamer = new GStreamerFullScreenVideoHandler;
 #endif
-
-#if USE(QTKIT)
-    m_FullScreenVideoHandlerQTKit = new QTKitFullScreenVideoHandler;
-#endif
 }
 
 FullScreenVideoQt::~FullScreenVideoQt()
@@ -116,9 +108,6 @@ FullScreenVideoQt::~FullScreenVideoQt()
 #if USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)
     delete m_FullScreenVideoHandlerGStreamer;
 #endif
-#if USE(QTKIT)
-    delete m_FullScreenVideoHandlerQTKit;
-#endif
 }
 
 void FullScreenVideoQt::enterFullScreenForNode(Node* node)
@@ -147,10 +136,6 @@ void FullScreenVideoQt::enterFullScreenForNode(Node* node)
     m_FullScreenVideoHandlerGStreamer->setVideoElement(m_videoElement);
     m_FullScreenVideoHandlerGStreamer->enterFullScreen();
 #endif
-
-#if USE(QTKIT)
-    m_FullScreenVideoHandlerQTKit->enterFullScreen(m_videoElement);
-#endif
 }
 
 void FullScreenVideoQt::exitFullScreenForNode(Node* node)
@@ -177,11 +162,6 @@ void FullScreenVideoQt::exitFullScreenForNode(Node* node)
 #if USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)
     m_FullScreenVideoHandlerGStreamer->exitFullScreen();
 #endif
-
-#if USE(QTKIT)
-    m_FullScreenVideoHandlerQTKit->exitFullScreen();
-#endif
-
 }
 
 void FullScreenVideoQt::aboutToClose()
@@ -215,8 +195,6 @@ bool FullScreenVideoQt::isValid() const
 #endif
 #if USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)
     return m_FullScreenVideoHandlerGStreamer;
-#elif USE(QTKIT)
-    return m_FullScreenVideoHandlerQTKit;
 #else
     return 0;
 #endif
index 438ab3f..f5ba079 100644 (file)
@@ -38,9 +38,6 @@ class Node;
 #if USE(QT_MULTIMEDIA)
 class MediaPlayerPrivateQt;
 #endif
-#if USE(QTKIT)
-class QTKitFullScreenVideoHandler;
-#endif
 
 // We do not use ENABLE or USE because moc does not expand these macros.
 #if defined(WTF_USE_GSTREAMER) && WTF_USE_GSTREAMER && defined(WTF_USE_NATIVE_FULLSCREEN_VIDEO) && WTF_USE_NATIVE_FULLSCREEN_VIDEO
@@ -93,9 +90,6 @@ private:
 #if USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)
     GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer;
 #endif
-#if USE(QTKIT)
-    QTKitFullScreenVideoHandler* m_FullScreenVideoHandlerQTKit;
-#endif
 };
 
 }
index 0e44512..8e56ad3 100644 (file)
@@ -43,9 +43,6 @@
 #include "ScriptController.h"
 #include "ScrollbarThemeQStyle.h"
 #include "SecurityPolicy.h"
-#if USE(QTKIT)
-#include "WebSystemInterface.h"
-#endif
 
 #include "qwebelement_p.h"
 #include <JavaScriptCore/runtime/InitializeThreading.h>
@@ -107,9 +104,6 @@ Q_DECL_EXPORT void initializeWebCoreQt()
     PlatformStrategiesQt::initialize();
     QtWebElementRuntime::initialize();
 
-#if USE(QTKIT)
-    InitWebCoreSystemInterface();
-#endif
     if (!WebCore::memoryCache()->disabled())
         WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(60);
 
diff --git a/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.h b/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.h
deleted file mode 100644 (file)
index f8ac15a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef QTKitFullScreenVideoHandler_h
-#define QTKitFullScreenVideoHandler_h
-
-#include <wtf/OwnPtr.h>
-
-namespace WebCore {
-
-class HTMLVideoElement;
-
-class QTKitFullScreenVideoHandler {
-    class QTKitFullScreenVideoHandlerPrivate;
-public:
-    QTKitFullScreenVideoHandler();
-    ~QTKitFullScreenVideoHandler();
-    void enterFullScreen(HTMLVideoElement*);
-    void exitFullScreen();
-
-private:
-    OwnPtr<QTKitFullScreenVideoHandlerPrivate> privateData;
-};
-
-}
-
-#endif // QTKitFullScreenVideoHandler_h
diff --git a/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.mm b/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.mm
deleted file mode 100644 (file)
index 584b9fa..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-
-#include "QTKitFullScreenVideoHandler.h"
-
-#include "HTMLVideoElement.h"
-#include "WebVideoFullscreenController.h"
-
-using namespace WebCore;
-
-class QTKitFullScreenVideoHandler::QTKitFullScreenVideoHandlerPrivate {
-public :
-    WebVideoFullscreenController* m_FullScreenController;
-};
-
-QTKitFullScreenVideoHandler::QTKitFullScreenVideoHandler()
-    : privateData (adoptPtr(new QTKitFullScreenVideoHandlerPrivate))
-{
-    privateData->m_FullScreenController = nil;
-}
-
-QTKitFullScreenVideoHandler::~QTKitFullScreenVideoHandler()
-{
-    exitFullScreen();
-}
-
-void QTKitFullScreenVideoHandler::enterFullScreen(HTMLVideoElement* videoElement)
-{
-    if (privateData->m_FullScreenController) {
-        // First exit fullscreen for the old mediaElement.
-        exitFullScreen();
-        ASSERT(!privateData->m_FullScreenController);
-    }
-    if (!privateData->m_FullScreenController) {
-        privateData->m_FullScreenController = [[WebVideoFullscreenController alloc] init];
-        [privateData->m_FullScreenController setMediaElement:videoElement];
-        NSScreen* currentScreen = [NSScreen mainScreen];
-        [privateData->m_FullScreenController enterFullscreen:currentScreen];
-    }
-}
-
-void QTKitFullScreenVideoHandler::exitFullScreen()
-{
-    [privateData->m_FullScreenController exitFullscreen];
-    [privateData->m_FullScreenController release];
-    privateData->m_FullScreenController = nil;
-}
diff --git a/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.h b/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.h
deleted file mode 100644 (file)
index 9b03d4a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2006 Apple Computer, Inc. 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. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 WebSystemInterface_h
-#define WebSystemInterface_h
-
-#include <stdint.h>
-
-void InitWebCoreSystemInterface();
-
-#endif
diff --git a/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.mm b/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.mm
deleted file mode 100644 (file)
index 8354af9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2006, 2007, 2008, 2009, 2010 Apple Inc. 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. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#import "WebSystemInterface.h"
-
-// Needed for builds not using PCH to expose BUILDING_ macros, see bug 32753.
-#include <wtf/Platform.h>
-
-#import <WebCoreSystemInterface.h>
-#import <WebKitSystemInterface.h>
-
-#define INIT(function) wk##function = WK##function
-
-void InitWebCoreSystemInterface(void)
-{
-    static bool didInit;
-    if (didInit)
-        return;
-
-    INIT(QTIncludeOnlyModernMediaFileTypes);
-    INIT(QTMovieDataRate);
-    INIT(QTMovieDisableComponent);
-    INIT(QTMovieMaxTimeLoaded);
-    INIT(QTMovieMaxTimeLoadedChangeNotification);
-    INIT(QTMovieMaxTimeSeekable);
-    INIT(QTMovieGetType);
-    INIT(QTMovieHasClosedCaptions);
-    INIT(QTMovieResolvedURL);
-    INIT(QTMovieSetShowClosedCaptions);
-    INIT(QTMovieSelectPreferredAlternates);
-    INIT(QTMovieViewSetDrawSynchronously);
-    INIT(QTGetSitesInMediaDownloadCache);
-    INIT(QTClearMediaDownloadCacheForSite);
-    INIT(QTClearMediaDownloadCache);
-    INIT(CreateMediaUIBackgroundView);
-    INIT(CreateMediaUIControl);
-    INIT(WindowSetAlpha);
-    INIT(WindowSetScaledFrame);
-
-    didInit = true;
-}
index 7ee16db..361f203 100644 (file)
@@ -1,3 +1,25 @@
+2013-06-17  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Remove Qt specific QTKIT flagged code.
+        https://bugs.webkit.org/show_bug.cgi?id=117635
+
+        Reviewed by Simon Hausmann.
+
+        Due to disabling QTKIT for Qt in r151546, the
+        code the flags that are not taken into account
+        anymore and the code that has been rendered
+        unreachable by this are removed.
+
+        * Target.pri:
+        * UIProcess/qt/WebContextQt.cpp:
+        (WebKit::WebContext::platformInitializeWebProcess):
+        * WebProcess/WebCoreSupport/qt/WebSystemInterface.h: Removed.
+        * WebProcess/WebCoreSupport/qt/WebSystemInterface.mm: Removed.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        * WebProcess/qt/WebProcessMainQt.cpp:
+        (WebKit::WebProcessMainQt):
+
 2013-06-17  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 
         Unreviewed, rolling out r151632.
index 5f5dad0..58a64ac 100644 (file)
@@ -851,18 +851,6 @@ have?(QTQUICK) {
 }
 
 mac: {
-    use?(QTKIT) {
-        DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
-        isEqual(QT_ARCH, "i386") {
-            DEFINES+=NS_BUILD_32_LIKE_64
-        }
-        INCLUDEPATH += \
-            $$PWD/../../WebKitLibraries/
-        HEADERS += \
-            WebProcess/WebCoreSupport/qt/WebSystemInterface.h
-        OBJECTIVE_SOURCES += \
-            WebProcess/WebCoreSupport/qt/WebSystemInterface.mm
-    }
     INCLUDEPATH += \
         Platform/mac \
         Platform/CoreIPC/mac
index 44827ee..7661559 100644 (file)
@@ -30,7 +30,6 @@
 #include "ApplicationCacheStorage.h"
 #include "WKSharedAPICast.h"
 #include "WebProcessCreationParameters.h"
-#include "WebSystemInterface.h"
 #include <QProcess>
 
 #if ENABLE(GEOLOCATION)
@@ -57,9 +56,6 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para
     static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(supplement<WebGeolocationManagerProxy>()));
     WKGeolocationManagerSetProvider(toAPI(supplement<WebGeolocationManagerProxy>()), WebGeolocationProviderQt::provider(location));
 #endif
-#if USE(QTKIT)
-    InitWebCoreSystemInterfaceForWK2();
-#endif
 }
 
 void WebContext::platformInvalidateContext()
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebSystemInterface.h b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebSystemInterface.h
deleted file mode 100644 (file)
index eec0cbb..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2006 Apple Computer, Inc. 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. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 <stdint.h>
-
-void InitWebCoreSystemInterfaceForWK2();
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebSystemInterface.mm b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebSystemInterface.mm
deleted file mode 100644 (file)
index 1a0c0f6..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2006, 2007, 2008, 2009, 2010 Apple Inc. 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. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#import "WebSystemInterface.h"
-
-// Needed for builds not using PCH to expose BUILDING_ macros, see bug 32753.
-#include <wtf/Platform.h>
-
-#import <WebCoreSystemInterface.h>
-#import <WebKitSystemInterface.h>
-
-#define INIT(function) wk##function = WK##function
-
-void InitWebCoreSystemInterfaceForWK2(void)
-{
-    static bool didInit;
-    if (didInit)
-        return;
-
-    INIT(QTIncludeOnlyModernMediaFileTypes);
-    INIT(QTMovieDataRate);
-    INIT(QTMovieDisableComponent);
-    INIT(QTMovieMaxTimeLoaded);
-    INIT(QTMovieMaxTimeLoadedChangeNotification);
-    INIT(QTMovieMaxTimeSeekable);
-    INIT(QTMovieGetType);
-    INIT(QTMovieHasClosedCaptions);
-    INIT(QTMovieResolvedURL);
-    INIT(QTMovieSetShowClosedCaptions);
-    INIT(QTMovieSelectPreferredAlternates);
-    INIT(QTMovieViewSetDrawSynchronously);
-    INIT(QTGetSitesInMediaDownloadCache);
-    INIT(QTClearMediaDownloadCacheForSite);
-    INIT(QTClearMediaDownloadCache);
-    INIT(CreateMediaUIBackgroundView);
-    INIT(CreateMediaUIControl);
-    INIT(WindowSetAlpha);
-    INIT(WindowSetScaledFrame);
-
-    didInit = true;
-}
index d070b47..2bea1ac 100644 (file)
@@ -2500,7 +2500,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings->setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC)
     settings->setQTKitEnabled(store.getBoolValueForKey(WebPreferencesKey::isQTKitEnabledKey()));
 #endif
 
index f0b51c1..ccd93a9 100644 (file)
 #include <WebCore/RunLoop.h>
 #include <errno.h>
 
-#if USE(QTKIT)
-#include "WebSystemInterface.h"
-#endif
-
 #ifndef NDEBUG
 #if !OS(WINDOWS)
 #include <unistd.h>
@@ -213,10 +209,6 @@ Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app)
 
     InitializeWebKit2();
 
-#if USE(QTKIT)
-    InitWebCoreSystemInterfaceForWK2();
-#endif
-
     // Create the connection.
     if (app->arguments().size() <= 1) {
         qDebug() << "Error: wrong number of arguments.";
index aa07f7e..e83dff2 100644 (file)
@@ -149,7 +149,7 @@ INCLUDEPATH += \
     $$PWD/qt/WebCoreSupport
 
 enable?(VIDEO) {
-    !use?(QTKIT):!use?(GSTREAMER):use?(QT_MULTIMEDIA) {
+    !use?(GSTREAMER):use?(QT_MULTIMEDIA) {
         HEADERS += $$PWD/WebKit/qt/WidgetSupport/FullScreenVideoWidget.h
         SOURCES += $$PWD/WebKit/qt/WidgetSupport/FullScreenVideoWidget.cpp
     }