Changeset 121686 in webkit

Timestamp:

Jul 2, 2012 9:31:10 AM (12 years ago)

Author:

alexis.menard@openbossa.org

Message:

[Qt] Fix WebProcess crash on Mac when accessing a site with video tag.
​https://bugs.webkit.org/show_bug.cgi?id=90384

Reviewed by Jocelyn Turcotte.

We need to initialize the private symbols used by MediaPlayerPrivateQTKit
otherwise they will be null and it will lead to a crash. We copy WebSystemInterface
files for WK2 just like the Mac port as WK2 may have different needs than WK1 layer (we
may add or remove symbols in here). It doesn't fix the video rendering yet but it's
first step.

• Target.pri:
• WebProcess/WebCoreSupport/qt/WebSystemInterface.h: Added.
• WebProcess/WebCoreSupport/qt/WebSystemInterface.mm: Added.

(InitWebCoreSystemInterfaceForWK2):

• WebProcess/qt/WebProcessMainQt.cpp:

(WebKit::WebProcessMainQt):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Target.pri (modified) (1 diff)
• WebProcess/WebCoreSupport/qt/WebSystemInterface.h (added)
• WebProcess/WebCoreSupport/qt/WebSystemInterface.mm (added)
• WebProcess/qt/WebProcessMainQt.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-02  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Fix WebProcess crash on Mac when accessing a site with video tag.
+        https://bugs.webkit.org/show_bug.cgi?id=90384
+
+        Reviewed by Jocelyn Turcotte.
+
+        We need to initialize the private symbols used by MediaPlayerPrivateQTKit
+        otherwise they will be null and it will lead to a crash. We copy WebSystemInterface
+        files for WK2 just like the Mac port as WK2 may have different needs than WK1 layer (we
+        may add or remove symbols in here). It doesn't fix the video rendering yet but it's
+        first step.
+
+        * Target.pri:
+        * WebProcess/WebCoreSupport/qt/WebSystemInterface.h: Added.
+        * WebProcess/WebCoreSupport/qt/WebSystemInterface.mm: Added.
+        (InitWebCoreSystemInterfaceForWK2):
+        * WebProcess/qt/WebProcessMainQt.cpp:
+        (WebKit::WebProcessMainQt):
+
 2012-07-02  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
 

trunk/Source/WebKit2/Target.pri

@@ -772 +772 @@
 
 mac: {
+
+    contains(DEFINES, WTF_USE_QTKIT=1) {
+        DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+        INCLUDEPATH += \
+            $$PWD/../../WebKitLibraries/
+        HEADERS += \
+            WebProcess/WebCoreSupport/qt/WebSystemInterface.h
+        SOURCES += \
+            WebProcess/WebCoreSupport/qt/WebSystemInterface.mm
+    }
     INCLUDEPATH += \
         Platform/mac \

trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp

@@ -40 +40 @@
 #if USE(ACCELERATED_COMPOSITING)
 #include "WebGraphicsLayer.h"
+#endif
+#if USE(QTKIT)
+#include "WebSystemInterface.h"
 #endif
 
@@ -149 +152 @@
     WTF::initializeMainThread();
     RunLoop::initializeMainRunLoop();
+    
+#if USE(QTKIT)
+    InitWebCoreSystemInterfaceForWK2();
+#endif
 
     // Create the connection.