Updated WebKit to 65360d3d3377f120aecccf1bf9b9ae9444d488e1

27 files changed, 232 insertions, 72 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 2bd1785..edee924 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-af58e9520937cc6fc3e31fe5d6682d19842e044d
+65360d3d3377f120aecccf1bf9b9ae9444d488e1
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
index 4954c25..0fba3dd 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,26 @@
+2011-05-12  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin Adler.
+
+        XMLDocumentParserLibxml2 should play nice with strict OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=59394
+
+        This portion of the change introduces a PassTraits template, which
+        is used to enable takeFirst() to work for a Deque holding OwnPtrs,
+        and optimize it for a Deque holding RefPtrs. In the future it can
+        be deployed elsewhere to make our data structures work better with
+        our smart pointers.
+
+        * GNUmakefile.list.am:
+        * JavaScriptCore.gypi:
+        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * wtf/CMakeLists.txt:
+        * wtf/Deque.h:
+        (WTF::::takeFirst):
+        * wtf/PassTraits.h: Added.
+        (WTF::PassTraits::transfer):
+
 2011-05-26  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am b/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am
index aa0ff68..16bbf56 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am
@@ -478,6 +478,7 @@ javascriptcore_sources += \
 	Source/JavaScriptCore/wtf/PassOwnArrayPtr.h \
 	Source/JavaScriptCore/wtf/PassOwnPtr.h \
 	Source/JavaScriptCore/wtf/PassRefPtr.h \
+	Source/JavaScriptCore/wtf/PassTraits.h \
 	Source/JavaScriptCore/wtf/ParallelJobs.h \
 	Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp \
 	Source/JavaScriptCore/wtf/ParallelJobsGeneric.h \
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.gypi b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.gypi
index 352ec97..cc18967 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.gypi
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.gypi
@@ -186,6 +186,7 @@
             'wtf/PassOwnArrayPtr.h',
             'wtf/PassOwnPtr.h',
             'wtf/PassRefPtr.h',
+            'wtf/PassTraits.h',
             'wtf/Platform.h',
             'wtf/PossiblyNull.h',
             'wtf/RandomNumber.h',
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/CMakeLists.txt b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/CMakeLists.txt
index d0d5363..87674b1 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/CMakeLists.txt
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/CMakeLists.txt
@@ -58,6 +58,7 @@ SET(WTF_HEADERS
     PassOwnArrayPtr.h
     PassOwnPtr.h
     PassRefPtr.h
+    PassTraits.h
     ParallelJobs.h
     ParallelJobsGeneric.h
     ParallelJobsLibdispatch.h
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Deque.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Deque.h
index 8ae46e9..8e42335 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Deque.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Deque.h
@@ -33,6 +33,7 @@
 // FIXME: Could move what Vector and Deque share into a separate file.
 // Deque doesn't actually use Vector.
 
+#include "PassTraits.h"
 #include "Vector.h"
 
 namespace WTF {
@@ -51,6 +52,8 @@ namespace WTF {
         typedef DequeConstIterator<T, inlineCapacity> const_iterator;
         typedef DequeReverseIterator<T, inlineCapacity> reverse_iterator;
         typedef DequeConstReverseIterator<T, inlineCapacity> const_reverse_iterator;
+        typedef PassTraits<T> Pass;
+        typedef typename PassTraits<T>::PassType PassType;
 
         Deque();
         Deque(const Deque<T, inlineCapacity>&);
@@ -73,7 +76,7 @@ namespace WTF {
 
         T& first() { ASSERT(m_start != m_end); return m_buffer.buffer()[m_start]; }
         const T& first() const { ASSERT(m_start != m_end); return m_buffer.buffer()[m_start]; }
-        T takeFirst();
+        PassType takeFirst();
 
         template<typename U> void append(const U&);
         template<typename U> void prepend(const U&);
@@ -436,11 +439,11 @@ namespace WTF {
     }
 
     template<typename T, size_t inlineCapacity>
-    inline T Deque<T, inlineCapacity>::takeFirst()
+    inline typename Deque<T, inlineCapacity>::PassType Deque<T, inlineCapacity>::takeFirst()
     {
-        T oldFirst = first();
+        T oldFirst = Pass::transfer(first());
         removeFirst();
-        return oldFirst;
+        return Pass::transfer(oldFirst);
     }
 
     template<typename T, size_t inlineCapacity> template<typename U>
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PassTraits.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PassTraits.h
new file mode 100644
index 0000000..3462734
--- /dev/null
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PassTraits.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+#ifndef WTF_PassTraits_h
+#define WTF_PassTraits_h
+
+#include "OwnPtr.h"
+#include "RefPtr.h"
+
+// The PassTraits template exists to help optimize (or make possible) use
+// of WTF data structures with WTF smart pointers that have a Pass
+// variant for transfer of ownership
+
+namespace WTF {
+
+template<typename T> struct PassTraits {
+    typedef T Type;
+    typedef T PassType;
+    static PassType transfer(Type& value) { return value; }
+};
+
+template<typename T> struct PassTraits<OwnPtr<T> > {
+    typedef OwnPtr<T> Type;
+    typedef PassOwnPtr<T> PassType;
+    static PassType transfer(Type& value) { return value.release(); }
+};
+
+template<typename T> struct PassTraits<RefPtr<T> > {
+    typedef RefPtr<T> Type;
+    typedef PassRefPtr<T> PassType;
+    static PassType transfer(Type& value) { return value.release(); }
+};
+
+} // namespace WTF
+
+using WTF::PassTraits;
+
+#endif // WTF_PassTraits_h
diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog
index fbd5b50..1a30d67 100644
--- a/src/3rdparty/webkit/Source/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog
@@ -1,3 +1,82 @@
+2011-05-13  Adam Roben  <aroben@apple.com>
+
+        Build fix after r86418
+
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h:
+        Made the destructor public so that this class can be used with
+        [Pass]OwnPtr.
+
+2011-05-13  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Enable OwnPtr strict mode in MediaPlayer
+        https://bugs.webkit.org/show_bug.cgi?id=59466
+
+        Let the CreateMediaEnginePlayer function return a PassOwnPtr instead of a raw pointer.
+        Also fix the templete argument of OwnPtr for the m_private member variable.
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::MediaPlayer):
+        (WebCore::MediaPlayer::loadWithNextMediaEngine):
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::create):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::create):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::create):
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
+        (WebCore::MediaPlayerPrivatePhonon::create):
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.h:
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::create):
+        * platform/graphics/qt/MediaPlayerPrivateQt.h:
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::create):
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
+        (WebCore::MediaPlayerPrivate::create):
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h:
+        * platform/graphics/wince/MediaPlayerPrivateWinCE.h:
+
+2011-05-12  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin Adler.
+
+        XMLDocumentParserLibxml2 should play nice with strict OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=59394
+
+        Properly fix this (formerly rolled out for breaking the build). I think the original
+        failure had nothing to do with Deque<OwnPtr>, which in fact appears to work fine.
+
+        * dom/XMLDocumentParserLibxml2.cpp:
+        (WebCore::PendingCallbacks::~PendingCallbacks):
+        (WebCore::PendingCallbacks::create):
+        (WebCore::PendingCallbacks::appendStartElementNSCallback):
+        (WebCore::PendingCallbacks::appendEndElementNSCallback):
+        (WebCore::PendingCallbacks::appendCharactersCallback):
+        (WebCore::PendingCallbacks::appendProcessingInstructionCallback):
+        (WebCore::PendingCallbacks::appendCDATABlockCallback):
+        (WebCore::PendingCallbacks::appendCommentCallback):
+        (WebCore::PendingCallbacks::appendInternalSubsetCallback):
+        (WebCore::PendingCallbacks::appendErrorCallback):
+        (WebCore::PendingCallbacks::PendingCallbacks):
+        (WebCore::XMLDocumentParser::XMLDocumentParser):
+
+2011-05-31  Oleg Romashin  <oleg.romashin@nokia.com>
+
+        Reviewed by Benjamin Poulain.
+
+        Fix compilation with debug enabled, m_lightSource.type is not valid anymore
+        https://bugs.webkit.org/show_bug.cgi?id=61719
+
+        * platform/graphics/filters/arm/FELightingNEON.h:
+        (WebCore::FELighting::platformApplyNeon):
+
 2011-05-12  Daniel Bates  <dbates@rim.com>
 
         Attempt to fix the build after changeset 86391 <http://trac.webkit.org/changeset/86391>
diff --git a/src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserLibxml2.cpp b/src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserLibxml2.cpp
index c598d99..b7867c7 100644
--- a/src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserLibxml2.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserLibxml2.cpp
@@ -25,10 +25,6 @@
  */
 
 #include "config.h"
-
-// FIXME: Remove this define!
-#define LOOSE_OWN_PTR
-
 #include "XMLDocumentParser.h"
 
 #include "CDATASection.h"
@@ -84,16 +80,16 @@ namespace WebCore {
 class PendingCallbacks {
     WTF_MAKE_NONCOPYABLE(PendingCallbacks);
 public:
-    PendingCallbacks() { }
-    ~PendingCallbacks()
+    ~PendingCallbacks() { }
+    static PassOwnPtr<PendingCallbacks> create()
     {
-        deleteAllValues(m_callbacks);
+        return adoptPtr(new PendingCallbacks);
     }
-
+    
     void appendStartElementNSCallback(const xmlChar* xmlLocalName, const xmlChar* xmlPrefix, const xmlChar* xmlURI, int nb_namespaces,
                                       const xmlChar** namespaces, int nb_attributes, int nb_defaulted, const xmlChar** attributes)
     {
-        PendingStartElementNSCallback* callback = new PendingStartElementNSCallback;
+        OwnPtr<PendingStartElementNSCallback> callback = adoptPtr(new PendingStartElementNSCallback);
 
         callback->xmlLocalName = xmlStrdup(xmlLocalName);
         callback->xmlPrefix = xmlStrdup(xmlPrefix);
@@ -118,87 +114,87 @@ public:
             callback->attributes[i * 5 + 4] = callback->attributes[i * 5 + 3] + len;
         }
 
-        m_callbacks.append(callback);
+        m_callbacks.append(callback.release());
     }
 
     void appendEndElementNSCallback()
     {
-        PendingEndElementNSCallback* callback = new PendingEndElementNSCallback;
-
-        m_callbacks.append(callback);
+        m_callbacks.append(adoptPtr(new PendingEndElementNSCallback));
     }
 
     void appendCharactersCallback(const xmlChar* s, int len)
     {
-        PendingCharactersCallback* callback = new PendingCharactersCallback;
+        OwnPtr<PendingCharactersCallback> callback = adoptPtr(new PendingCharactersCallback);
 
         callback->s = xmlStrndup(s, len);
         callback->len = len;
 
-        m_callbacks.append(callback);
+        m_callbacks.append(callback.release());
     }
 
     void appendProcessingInstructionCallback(const xmlChar* target, const xmlChar* data)
     {
-        PendingProcessingInstructionCallback* callback = new PendingProcessingInstructionCallback;
+        OwnPtr<PendingProcessingInstructionCallback> callback = adoptPtr(new PendingProcessingInstructionCallback);
 
         callback->target = xmlStrdup(target);
         callback->data = xmlStrdup(data);
 
-        m_callbacks.append(callback);
+        m_callbacks.append(callback.release());
     }
 
     void appendCDATABlockCallback(const xmlChar* s, int len)
     {
-        PendingCDATABlockCallback* callback = new PendingCDATABlockCallback;
+        OwnPtr<PendingCDATABlockCallback> callback = adoptPtr(new PendingCDATABlockCallback);
 
         callback->s = xmlStrndup(s, len);
         callback->len = len;
 
-        m_callbacks.append(callback);
+        m_callbacks.append(callback.release());
     }
 
     void appendCommentCallback(const xmlChar* s)
     {
-        PendingCommentCallback* callback = new PendingCommentCallback;
+        OwnPtr<PendingCommentCallback> callback = adoptPtr(new PendingCommentCallback);
 
         callback->s = xmlStrdup(s);
 
-        m_callbacks.append(callback);
+        m_callbacks.append(callback.release());
     }
 
     void appendInternalSubsetCallback(const xmlChar* name, const xmlChar* externalID, const xmlChar* systemID)
     {
-        PendingInternalSubsetCallback* callback = new PendingInternalSubsetCallback;
+        OwnPtr<PendingInternalSubsetCallback> callback = adoptPtr(new PendingInternalSubsetCallback);
 
         callback->name = xmlStrdup(name);
         callback->externalID = xmlStrdup(externalID);
         callback->systemID = xmlStrdup(systemID);
 
-        m_callbacks.append(callback);
+        m_callbacks.append(callback.release());
     }
 
     void appendErrorCallback(XMLDocumentParser::ErrorType type, const xmlChar* message, int lineNumber, int columnNumber)
     {
-        PendingErrorCallback* callback = new PendingErrorCallback;
+        OwnPtr<PendingErrorCallback> callback = adoptPtr(new PendingErrorCallback);
 
         callback->message = xmlStrdup(message);
         callback->type = type;
         callback->lineNumber = lineNumber;
         callback->columnNumber = columnNumber;
 
-        m_callbacks.append(callback);
+        m_callbacks.append(callback.release());
     }
 
     void callAndRemoveFirstCallback(XMLDocumentParser* parser)
     {
-        OwnPtr<PendingCallback> callback(m_callbacks.takeFirst());
+        OwnPtr<PendingCallback> callback = m_callbacks.takeFirst();
         callback->call(parser);
     }
 
     bool isEmpty() const { return m_callbacks.isEmpty(); }
 
 private:
+    PendingCallbacks() { }
+
     struct PendingCallback {
         virtual ~PendingCallback() { }
         virtual void call(XMLDocumentParser* parser) = 0;
@@ -338,7 +334,7 @@ private:
         int columnNumber;
     };
 
-    Deque<PendingCallback*> m_callbacks;
+    Deque<OwnPtr<PendingCallback> > m_callbacks;
 };
 // --------------------------------
 
@@ -551,7 +547,7 @@ XMLDocumentParser::XMLDocumentParser(Document* document, FrameView* frameView)
     : ScriptableDocumentParser(document)
     , m_view(frameView)
     , m_context(0)
-    , m_pendingCallbacks(new PendingCallbacks)
+    , m_pendingCallbacks(PendingCallbacks::create())
     , m_currentNode(document)
     , m_sawError(false)
     , m_sawCSS(false)
@@ -578,7 +574,7 @@ XMLDocumentParser::XMLDocumentParser(DocumentFragment* fragment, Element* parent
     : ScriptableDocumentParser(fragment->document())
     , m_view(0)
     , m_context(0)
-    , m_pendingCallbacks(new PendingCallbacks)
+    , m_pendingCallbacks(PendingCallbacks::create())
     , m_currentNode(fragment)
     , m_sawError(false)
     , m_sawCSS(false)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.cpp
index e419ade..40ea0ae 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.cpp
@@ -25,9 +25,6 @@
 
 #include "config.h"
 
-// FIXME: Remove this define!
-#define LOOSE_OWN_PTR
-
 #if ENABLE(VIDEO)
 #include "MediaPlayer.h"
 
@@ -310,8 +307,7 @@ MediaPlayer::MediaPlayer(MediaPlayerClient* client)
     Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
     if (!engines.isEmpty()) {
         m_currentMediaEngine = engines[0];
-        m_private.clear();
-        m_private.set(engines[0]->constructor(this));
+        m_private = engines[0]->constructor(this);
         if (m_mediaPlayerClient)
             m_mediaPlayerClient->mediaPlayerEngineUpdated(this);
     }
@@ -362,11 +358,10 @@ void MediaPlayer::loadWithNextMediaEngine(MediaPlayerFactory* current)
     // Don't delete and recreate the player unless it comes from a different engine.
     if (!engine) {
         m_currentMediaEngine = engine;
-        m_private.clear();
+        m_private = nullptr;
     } else if (m_currentMediaEngine != engine) {
         m_currentMediaEngine = engine;
-        m_private.clear();
-        m_private.set(engine->constructor(this));
+        m_private = engine->constructor(this);
         if (m_mediaPlayerClient)
             m_mediaPlayerClient->mediaPlayerEngineUpdated(this);
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h
index 3481b0e..13f6d58 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h
@@ -310,7 +310,7 @@ private:
 
     MediaPlayerClient* m_mediaPlayerClient;
     Timer<MediaPlayer> m_reloadTimer;
-    OwnPtr<MediaPlayerPrivateInterface*> m_private;
+    OwnPtr<MediaPlayerPrivateInterface> m_private;
     MediaPlayerFactory* m_currentMediaEngine;
     String m_url;
     String m_contentMIMEType;
@@ -330,7 +330,7 @@ private:
 #endif
 };
 
-typedef MediaPlayerPrivateInterface* (*CreateMediaEnginePlayer)(MediaPlayer*);
+typedef PassOwnPtr<MediaPlayerPrivateInterface> (*CreateMediaEnginePlayer)(MediaPlayer*);
 typedef void (*MediaEngineSupportedTypes)(HashSet<String>& types);
 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs);
 typedef void (*MediaEngineGetSitesInMediaCache)(Vector<String>&);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h
index 51fdb72..ebc6b27 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h
@@ -55,6 +55,7 @@ class ApplicationCacheResource;
 
 class MediaPlayerPrivateAVFoundationObjC : public MediaPlayerPrivateAVFoundation {
 public:
+    ~MediaPlayerPrivateAVFoundationObjC();
 
     static void registerMediaEngine(MediaEngineRegistrar);
 
@@ -63,10 +64,9 @@ public:
 
 private:
     MediaPlayerPrivateAVFoundationObjC(MediaPlayer*);
-    ~MediaPlayerPrivateAVFoundationObjC();
 
     // engine support
-    static MediaPlayerPrivateInterface* create(MediaPlayer* player);
+    static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
     static void getSupportedTypes(HashSet<String>& types);
     static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
     static bool isAvailable();
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm b/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm
index 542560a..af612ca 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm
@@ -123,9 +123,9 @@ static const char *boolString(bool val)
 
 static const float invalidTime = -1.0f;
 
-MediaPlayerPrivateInterface* MediaPlayerPrivateAVFoundationObjC::create(MediaPlayer* player) 
+PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivateAVFoundationObjC::create(MediaPlayer* player)
 { 
-    return new MediaPlayerPrivateAVFoundationObjC(player);
+    return adoptPtr(new MediaPlayerPrivateAVFoundationObjC(player));
 }
 
 void MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(MediaEngineRegistrar registrar)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.h
index ec5ead1..7cef8c2 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.h
@@ -142,7 +142,7 @@ inline void FELighting::platformApplyNeon(LightingData& data, LightSource::Paint
         if (spotLightSource->specularExponent() == 1)
             neonData.flags |= FLAG_CONE_EXPONENT_IS_1;
     } else {
-        ASSERT(m_lightSource.type == LS_DISTANT);
+        ASSERT(m_lightSource->type() == LS_DISTANT);
         floatArguments.lightX = paintingData.lightVector.x();
         floatArguments.lightY = paintingData.lightVector.y();
         floatArguments.lightZ = paintingData.lightVector.z();
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 881a693..8ff9ef0 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -151,9 +151,9 @@ static void mediaPlayerPrivateRepaintCallback(WebKitVideoSink*, GstBuffer *buffe
     playerPrivate->triggerRepaint(buffer);
 }
 
-MediaPlayerPrivateInterface* MediaPlayerPrivateGStreamer::create(MediaPlayer* player)
+PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivateGStreamer::create(MediaPlayer* player)
 {
-    return new MediaPlayerPrivateGStreamer(player);
+    return adoptPtr(new MediaPlayerPrivateGStreamer(player));
 }
 
 void MediaPlayerPrivateGStreamer::registerMediaEngine(MediaEngineRegistrar registrar)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
index 024fad0..f7a4e13 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
@@ -47,6 +47,7 @@ class MediaPlayerPrivateGStreamer;
 class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateInterface {
 
         public:
+            ~MediaPlayerPrivateGStreamer();
             static void registerMediaEngine(MediaEngineRegistrar);
             gboolean handleMessage(GstMessage*);
 
@@ -124,9 +125,8 @@ class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateInterface {
 
         private:
             MediaPlayerPrivateGStreamer(MediaPlayer*);
-            ~MediaPlayerPrivateGStreamer();
 
-            static MediaPlayerPrivateInterface* create(MediaPlayer* player);
+            static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
 
             static void getSupportedTypes(HashSet<String>&);
             static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
index b7bb86b..a926160 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
@@ -59,6 +59,7 @@ class ApplicationCacheResource;
 
 class MediaPlayerPrivateQTKit : public MediaPlayerPrivateInterface {
 public:
+    ~MediaPlayerPrivateQTKit();
     static void registerMediaEngine(MediaEngineRegistrar);
 
     void repaint();
@@ -70,10 +71,9 @@ public:
 
 private:
     MediaPlayerPrivateQTKit(MediaPlayer*);
-    ~MediaPlayerPrivateQTKit();
 
     // engine support
-    static MediaPlayerPrivateInterface* create(MediaPlayer* player);
+    static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
     static void getSupportedTypes(HashSet<String>& types);
     static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
     static void getSitesInMediaCache(Vector<String>&);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
index 5d6cb25..ba9fe06 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
@@ -181,11 +181,9 @@ using namespace std;
 
 namespace WebCore {
 
-
-
-MediaPlayerPrivateInterface* MediaPlayerPrivateQTKit::create(MediaPlayer* player) 
+PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivateQTKit::create(MediaPlayer* player)
 { 
-    return new MediaPlayerPrivateQTKit(player);
+    return adoptPtr(new MediaPlayerPrivateQTKit(player));
 }
 
 void MediaPlayerPrivateQTKit::registerMediaEngine(MediaEngineRegistrar registrar)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
index 547dabc..4e3969e 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
@@ -118,9 +118,9 @@ MediaPlayerPrivatePhonon::MediaPlayerPrivatePhonon(MediaPlayer* player)
     connect(m_mediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(totalTimeChanged(qint64)));
 }
 
-MediaPlayerPrivateInterface* MediaPlayerPrivatePhonon::create(MediaPlayer* player)
+PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivatePhonon::create(MediaPlayer* player)
 {
-    return new MediaPlayerPrivatePhonon(player);
+    return adoptPtr(new MediaPlayerPrivatePhonon(player));
 }
 
 void MediaPlayerPrivatePhonon::registerMediaEngine(MediaEngineRegistrar registrar)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h
index d793675..1d8a4f51 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h
@@ -128,7 +128,7 @@ namespace WebCore {
 
     private:
         MediaPlayerPrivatePhonon(MediaPlayer*);
-        static MediaPlayerPrivateInterface* create(MediaPlayer* player);
+        static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
 
         static void getSupportedTypes(HashSet<String>&);
         static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index e7efdf9..909c02d 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -58,9 +58,9 @@ using namespace WTF;
 
 namespace WebCore {
 
-MediaPlayerPrivateInterface* MediaPlayerPrivateQt::create(MediaPlayer* player)
+PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivateQt::create(MediaPlayer* player)
 {
-    return new MediaPlayerPrivateQt(player);
+    return adoptPtr(new MediaPlayerPrivateQt(player));
 }
 
 void MediaPlayerPrivateQt::registerMediaEngine(MediaEngineRegistrar registrar)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
index c6398c9..12381b2 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
@@ -40,7 +40,7 @@ class MediaPlayerPrivateQt : public QObject, public MediaPlayerPrivateInterface
     Q_OBJECT
 
 public:
-    static MediaPlayerPrivateInterface* create(MediaPlayer* player);
+    static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
     ~MediaPlayerPrivateQt();
 
     static void registerMediaEngine(MediaEngineRegistrar);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
index 913ad36..66019e8 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
@@ -148,9 +148,9 @@ private:
     MediaPlayerPrivateQuickTimeVisualContext* m_parent;
 };
 
-MediaPlayerPrivateInterface* MediaPlayerPrivateQuickTimeVisualContext::create(MediaPlayer* player) 
+PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivateQuickTimeVisualContext::create(MediaPlayer* player)
 { 
-    return new MediaPlayerPrivateQuickTimeVisualContext(player);
+    return adoptPtr(new MediaPlayerPrivateQuickTimeVisualContext(player));
 }
 
 void MediaPlayerPrivateQuickTimeVisualContext::registerMediaEngine(MediaEngineRegistrar registrar)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
index 0dc97cd..70fd2a5 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
@@ -126,7 +126,7 @@ private:
     void sawUnsupportedTracks();
 
     // engine support
-    static MediaPlayerPrivateInterface* create(MediaPlayer*);
+    static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
     static void getSupportedTypes(HashSet<String>& types);
     static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
     static bool isAvailable();
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
index f29696d..030885d 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
@@ -71,9 +71,9 @@ namespace WebCore {
 SOFT_LINK_LIBRARY(Wininet)
 SOFT_LINK(Wininet, InternetSetCookieExW, DWORD, WINAPI, (LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData, DWORD dwFlags, DWORD_PTR dwReserved), (lpszUrl, lpszCookieName, lpszCookieData, dwFlags, dwReserved))
 
-MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player) 
+PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivate::create(MediaPlayer* player)
 { 
-    return new MediaPlayerPrivate(player);
+    return adoptPtr(new MediaPlayerPrivate(player));
 }
 
 void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h
index ab9b1f0..943c853 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h
@@ -137,7 +137,7 @@ private:
     virtual void movieNewImageAvailable(QTMovieGWorld*);
 
     // engine support
-    static MediaPlayerPrivateInterface* create(MediaPlayer*);
+    static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
     static void getSupportedTypes(HashSet<String>& types);
     static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
     static bool isAvailable();
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index e779590..7a8ed41 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        af58e9520937cc6fc3e31fe5d6682d19842e044d
+        65360d3d3377f120aecccf1bf9b9ae9444d488e1