WebCore: [Qt] Land the initial build system for WebKit2

https://bugs.webkit.org/show_bug.cgi?id=41604

Patch by Antti Koivisto <koivisto@iki.fi> on 2010-07-13
Reviewed by Kenneth Rohde Christiansen.

The build is enabled by passing --qmakearg="CONFIG+=webkit2" to build-webkit

* WebCore.pri:
* WebCore.pro:

WebKit2: [Qt] Tweaks needed to compile WebKit2 with Qt
https://bugs.webkit.org/show_bug.cgi?id=41604

Reviewed by Kenneth Rohde Christiansen.

* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
(WebKit::ProcessLauncherHelper::launch): Adjust to PassOwnPtr API changes.
* WebProcess/InjectedBundle/API/c/WKBundlePage.h: Don't include JavaScriptCore.h,
as it unconditionally includes JSStringRefCF. Instead include JavaScript.h.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0768c25..a7ba0e7 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-13  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Land the initial build system for WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=41604
+
+        The build is enabled by passing --qmakearg="CONFIG+=webkit2" to build-webkit
+
+        * WebCore.pri:
+        * WebCore.pro:
+
 2010-07-13  Leon Clarke  <leonclarke@google.com>
 
         Reviewed by Pavel Feldman.

diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 7e4fd81..7205add 100644 (file)
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -664,8 +664,88 @@ IDL_BINDINGS += \
     xml/XPathEvaluator.idl \
     xml/XSLTProcessor.idl
 
+
 INSPECTOR_INTERFACES = inspector/Inspector.idl
 
+WEBCORE_HEADERS_FOR_WEBKIT2 += \
+    bindings/js/DOMWrapperWorld.h \
+    platform/FileChooser.h \
+    platform/network/qt/ResourceError.h \
+    platform/network/qt/ResourceRequest.h \
+    platform/network/qt/ResourceResponse.h \
+    dom/KeyboardEvent.h \
+    editing/EditCommand.h \
+    history/BackForwardList.h \
+    history/BackForwardControllerClient.h \
+    history/HistoryItem.h \
+    html/HTMLFormElement.h \
+    html/HTMLFrameOwnerElement.h \
+    inspector/InspectorClient.h \
+    loader/DocumentLoader.h \
+    loader/FormState.h \
+    loader/FrameLoader.h \
+    loader/FrameLoaderClient.h \
+    loader/FrameLoaderTypes.h \
+    loader/PolicyChecker.h \
+    loader/ProgressTracker.h \
+    page/animation/AnimationController.h \
+    page/Chrome.h \
+    page/ChromeClient.h \
+    page/ContextMenuClient.h \
+    page/DragClient.h \
+    page/EditorClient.h \
+    page/EventHandler.h \
+    page/FocusController.h \
+    page/Frame.h \
+    page/FrameLoadRequest.h \
+    page/FrameView.h \
+    page/Page.h \
+    page/Settings.h \
+    page/WindowFeatures.h \
+    platform/PlatformKeyboardEvent.h \
+    platform/PlatformMouseEvent.h \
+    platform/PlatformWheelEvent.h \
+    platform/Widget.h \
+    platform/KURL.h \
+    platform/graphics/FloatRect.h \
+    platform/graphics/GraphicsContext.h \
+    platform/graphics/GraphicsLayerClient.h \
+    platform/graphics/IntPoint.h \
+    platform/graphics/IntRect.h \
+    platform/graphics/IntSize.h \
+    platform/graphics/Tile.h \
+    platform/graphics/TiledBackingStore.h \
+    platform/graphics/TiledBackingStoreClient.h \
+    platform/text/PlatformString.h \
+    platform/text/StringImpl.h \
+    platform/MIMETypeRegistry.h \
+    rendering/RenderTreeAsText.h \
+    plugins/PluginData.h \
+
+JSC_HEADERS_FOR_WEBKIT2 += \
+    ../JavaScriptCore/runtime/JSObject.h \
+
+WEBKIT2_API_HEADERS += \
+    ../WebKit2/UIProcess/API/C/WKAPICast.h \
+    ../WebKit2/UIProcess/API/C/WKBase.h \
+    ../WebKit2/UIProcess/API/C/WKContext.h \
+    ../WebKit2/UIProcess/API/C/WKContextPrivate.h \
+    ../WebKit2/UIProcess/API/C/WKFrame.h \
+    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
+    ../WebKit2/UIProcess/API/C/WKNavigationData.h \
+    ../WebKit2/UIProcess/API/C/WKPage.h \
+    ../WebKit2/UIProcess/API/C/WKPageNamespace.h \
+    ../WebKit2/UIProcess/API/C/WKPagePrivate.h \
+    ../WebKit2/UIProcess/API/C/WKPreferences.h \
+    ../WebKit2/UIProcess/API/C/WKString.h \
+    ../WebKit2/UIProcess/API/C/WKURL.h \
+    ../WebKit2/UIProcess/API/C/WebKit2.h \
+    ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
+    ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \
+    ../WebKit2/UIProcess/API/qt/qwkpage.h \
+    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \
+    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
+
 mathmlnames.output = $${WC_GENERATED_SOURCES_DIR}/MathMLNames.cpp
 mathmlnames.input = MATHML_NAMES
 mathmlnames.wkScript = $$PWD/dom/make_names.pl
@@ -830,3 +910,30 @@ webkitversion.clean = ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
 webkitversion.wkAddOutputToSources = false
 addExtraCompiler(webkitversion)
 
+webkit2 {
+
+# GENERATOR 12: Copy WebCore headers for WebKit2
+webcoreheaders.output = ../include/WebCore/${QMAKE_FILE_BASE}.h
+webcoreheaders.input = WEBCORE_HEADERS_FOR_WEBKIT2
+webcoreheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+webcoreheaders.clean = ${QMAKE_FILE_OUT}
+webcoreheaders.wkAddOutputToSources = false
+addExtraCompiler(webcoreheaders)
+
+# GENERATOR 12-B: Copy JavaScriptCore headers for WebKit2
+jscheaders.output = ../include/JavaScriptCore/${QMAKE_FILE_BASE}.h
+jscheaders.input = JSC_HEADERS_FOR_WEBKIT2
+jscheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+jscheaders.clean = ${QMAKE_FILE_OUT}
+jscheaders.wkAddOutputToSources = false
+addExtraCompiler(jscheaders)
+
+# GENERATOR 13: Copy WebKit2 headers
+webkit2headers.output = ../include/WebKit2/${QMAKE_FILE_BASE}.h
+webkit2headers.input = WEBKIT2_API_HEADERS
+webkit2headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+webkit2headers.clean = ${QMAKE_FILE_OUT}
+webkit2headers.wkAddOutputToSources = false
+addExtraCompiler(webkit2headers)
+
+}

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 87cbe4b..5ce4c2f 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2,6 +2,10 @@
 CONFIG += building-libs
 CONFIG += depend_includepath
 
+meegotouch {
+    DEFINES += WTF_USE_MEEGOTOUCH=1
+}
+
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
@@ -3029,6 +3033,7 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
 }
 
 include($$PWD/../WebKit/qt/Api/headers.pri)
+
 HEADERS += $$WEBKIT_API_HEADERS
 
 !CONFIG(QTDIR_build) {
@@ -3149,6 +3154,192 @@ SOURCES += \
     rendering/RenderLayerCompositor.cpp
 }
 
+webkit2 {
+
+CONFIG += precompile_header
+PRECOMPILED_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
+
+INCLUDEPATH = \
+    $$PWD/../WebKit2/Platform \
+    $$PWD/../WebKit2/Platform/CoreIPC \
+    $$PWD/../WebKit2/Shared \
+    $$PWD/../WebKit2/Shared/CoreIPCSupport \
+    $$PWD/../WebKit2/Shared/qt \
+    $$PWD/../WebKit2/UIProcess \
+    $$PWD/../WebKit2/UIProcess/API/C \
+    $$PWD/../WebKit2/UIProcess/API/cpp \
+    $$PWD/../WebKit2/UIProcess/API/cpp/qt \
+    $$PWD/../WebKit2/UIProcess/API/qt \
+    $$PWD/../WebKit2/UIProcess/Launcher \
+    $$PWD/../WebKit2/UIProcess/Plugins \
+    $$PWD/../WebKit2/UIProcess/qt \
+    $$PWD/../WebKit2/WebProcess \
+    $$PWD/../WebKit2/WebProcess/InjectedBundle \
+    $$PWD/../WebKit2/WebProcess/InjectedBundle/API/c \
+    $$PWD/../WebKit2/WebProcess/WebCoreSupport \
+    $$PWD/../WebKit2/WebProcess/WebPage \
+    $$INCLUDEPATH \
+    $$OUTPUT_DIR/include \
+
+HEADERS += \
+    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
+    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
+    ../WebKit2/Platform/CoreIPC/Arguments.h \
+    ../WebKit2/Platform/CoreIPC/Attachment.h \
+    ../WebKit2/Platform/CoreIPC/Connection.h \
+    ../WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \
+    ../WebKit2/Platform/CoreIPC/MessageID.h \
+    ../WebKit2/Platform/PlatformProcessIdentifier.h \
+    ../WebKit2/Platform/RunLoop.h \
+    ../WebKit2/Platform/WorkItem.h \
+    ../WebKit2/Platform/WorkQueue.h \
+    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h \
+    ../WebKit2/Shared/NotImplemented.h \
+    ../WebKit2/Shared/qt/WebEventFactoryQt.h \
+    ../WebKit2/Shared/WebEventConversion.h \
+    ../WebKit2/Shared/WebEvent.h \
+    ../WebKit2/Shared/WebNavigationDataStore.h \
+    ../WebKit2/Shared/WebPreferencesStore.h \
+    ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
+    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.h \
+    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.h \
+    ../WebKit2/UIProcess/API/C/WebKit2.h \
+    ../WebKit2/UIProcess/API/C/WKAPICast.h \
+    ../WebKit2/UIProcess/API/C/WKBase.h \
+    ../WebKit2/UIProcess/API/C/WKContext.h \
+    ../WebKit2/UIProcess/API/C/WKContextPrivate.h \
+    ../WebKit2/UIProcess/API/C/WKFrame.h \
+    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
+    ../WebKit2/UIProcess/API/C/WKNavigationData.h \
+    ../WebKit2/UIProcess/API/C/WKPage.h \
+    ../WebKit2/UIProcess/API/C/WKPageNamespace.h \
+    ../WebKit2/UIProcess/API/C/WKPagePrivate.h \
+    ../WebKit2/UIProcess/API/C/WKPreferences.h \
+    ../WebKit2/UIProcess/API/C/WKString.h \
+    ../WebKit2/UIProcess/API/C/WKURL.h \
+    ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \
+    ../WebKit2/UIProcess/API/qt/qwkpage.h \
+    ../WebKit2/UIProcess/API/qt/qwkpage_p.h \
+    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h \
+    ../WebKit2/UIProcess/DrawingAreaProxy.h \
+    ../WebKit2/UIProcess/GenericCallback.h \
+    ../WebKit2/UIProcess/Launcher/ProcessLauncher.h \
+    ../WebKit2/UIProcess/Plugins/PluginInfoStore.h \
+    ../WebKit2/UIProcess/PageClient.h \
+    ../WebKit2/UIProcess/ProcessModel.h \
+    ../WebKit2/UIProcess/API/qt/ClientImpl.h \
+    ../WebKit2/UIProcess/ResponsivenessTimer.h \
+    ../WebKit2/UIProcess/WebContext.h \
+    ../WebKit2/UIProcess/WebContextInjectedBundleClient.h \
+    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.h \
+    ../WebKit2/UIProcess/WebFrameProxy.h \
+    ../WebKit2/UIProcess/WebHistoryClient.h \
+    ../WebKit2/UIProcess/WebLoaderClient.h \
+    ../WebKit2/UIProcess/WebNavigationData.h \
+    ../WebKit2/UIProcess/WebPageNamespace.h \
+    ../WebKit2/UIProcess/WebPageProxy.h \
+    ../WebKit2/UIProcess/WebPolicyClient.h \
+    ../WebKit2/UIProcess/WebPreferences.h \
+    ../WebKit2/UIProcess/WebProcessManager.h \
+    ../WebKit2/UIProcess/WebProcessProxy.h \
+    ../WebKit2/UIProcess/WebUIClient.h \
+    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \
+    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.h \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebErrors.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \
+    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
+    ../WebKit2/WebProcess/WebPage/DrawingArea.h \
+    ../WebKit2/WebProcess/WebPage/WebFrame.h \
+    ../WebKit2/WebProcess/WebPage/WebPage.h \
+    ../WebKit2/WebProcess/WebProcess.h \
+
+SOURCES += \
+    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
+    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
+    ../WebKit2/Platform/CoreIPC/Attachment.cpp \
+    ../WebKit2/Platform/CoreIPC/Connection.cpp \
+    ../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp \
+    ../WebKit2/Platform/RunLoop.cpp \
+    ../WebKit2/Platform/WorkQueue.cpp \
+    ../WebKit2/Platform/qt/RunLoopQt.cpp \
+    ../WebKit2/Platform/qt/WorkQueueQt.cpp \
+    ../WebKit2/Shared/ImmutableArray.cpp \
+    ../WebKit2/Shared/WebEventConversion.cpp \
+    ../WebKit2/Shared/WebPreferencesStore.cpp \
+    ../WebKit2/Shared/qt/UpdateChunk.cpp \
+    ../WebKit2/Shared/qt/WebEventFactoryQt.cpp \
+    ../WebKit2/UIProcess/API/C/WKContext.cpp \
+    ../WebKit2/UIProcess/API/C/WKFrame.cpp \
+    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp \
+    ../WebKit2/UIProcess/API/C/WKNavigationData.cpp \
+    ../WebKit2/UIProcess/API/C/WKPage.cpp \
+    ../WebKit2/UIProcess/API/C/WKPageNamespace.cpp \
+    ../WebKit2/UIProcess/API/C/WKPreferences.cpp \
+    ../WebKit2/UIProcess/API/C/WKString.cpp \
+    ../WebKit2/UIProcess/API/C/WKURL.cpp \
+    ../WebKit2/UIProcess/API/qt/qgraphicswkview.cpp \
+    ../WebKit2/UIProcess/API/qt/qwkpage.cpp \
+    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp \
+    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp \
+    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp \
+    ../WebKit2/UIProcess/DrawingAreaProxy.cpp \
+    ../WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \
+    ../WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp \
+    ../WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
+    ../WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
+    ../WebKit2/UIProcess/ResponsivenessTimer.cpp \
+    ../WebKit2/UIProcess/WebBackForwardList.cpp \
+    ../WebKit2/UIProcess/WebBackForwardListItem.cpp \
+    ../WebKit2/UIProcess/WebContext.cpp \
+    ../WebKit2/UIProcess/WebContextInjectedBundleClient.cpp \
+    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.cpp \
+    ../WebKit2/UIProcess/WebFrameProxy.cpp \
+    ../WebKit2/UIProcess/WebHistoryClient.cpp \
+    ../WebKit2/UIProcess/WebLoaderClient.cpp \
+    ../WebKit2/UIProcess/WebNavigationData.cpp \
+    ../WebKit2/UIProcess/WebPageNamespace.cpp \
+    ../WebKit2/UIProcess/WebPageProxy.cpp \
+    ../WebKit2/UIProcess/WebPolicyClient.cpp \
+    ../WebKit2/UIProcess/WebPreferences.cpp \
+    ../WebKit2/UIProcess/WebProcessManager.cpp \
+    ../WebKit2/UIProcess/WebProcessProxy.cpp \
+    ../WebKit2/UIProcess/WebUIClient.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
+    ../WebKit2/UIProcess/API/qt/ClientImpl.cpp \
+    ../WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \
+    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
+    ../WebKit2/WebProcess/WebPage/DrawingArea.cpp \
+    ../WebKit2/WebProcess/WebPage/WebFrame.cpp \
+    ../WebKit2/WebProcess/WebPage/WebPage.cpp \
+    ../WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp \
+    ../WebKit2/WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \
+    ../WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp \
+    ../WebKit2/WebProcess/WebProcess.cpp \
+
+}
+
 symbian {
     shared {
         contains(CONFIG, def_files) {

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5085c56..30a9689 100644 (file)
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-13  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Tweaks needed to compile WebKit2 with Qt
+        https://bugs.webkit.org/show_bug.cgi?id=41604
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncherHelper::launch): Adjust to PassOwnPtr API changes.
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.h: Don't include JavaScriptCore.h,
+        as it unconditionally includes JSStringRefCF. Instead include JavaScript.h.
+
 2010-07-12  Steve Falkenburg  <sfalken@apple.com>
 
         Windows build fix.

diff --git a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
index 9e4bdb6..efa6cee 100644 (file)
--- a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
+++ b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
@@ -91,7 +91,7 @@ void ProcessLauncherHelper::launch(WebKit::ProcessLauncher* launcher)
 
     setpriority(PRIO_PROCESS, webProcess->pid(), 10);
 
-    m_items.append(WorkItem::create(launcher, &WebKit::ProcessLauncher::didFinishLaunchingProcess, webProcess, m_server.serverName()).release());
+    m_items.append(WorkItem::create(launcher, &WebKit::ProcessLauncher::didFinishLaunchingProcess, webProcess, m_server.serverName()).leakPtr());
 }
 
 QLocalSocket* ProcessLauncherHelper::takePendingConnection()

diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
index cb6a9dc..1236899 100644 (file)
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
@@ -26,7 +26,7 @@
 #ifndef WKBundlePage_h
 #define WKBundlePage_h
 
-#include <JavaScriptCore/JavaScriptCore.h>
+#include <JavaScriptCore/JavaScript.h>
 #include <WebKit2/WKBase.h>
 #include <WebKit2/WKBundleBase.h>