Title: [198757] trunk/Source/WebKit2
- Revision
- 198757
- Author
- clo...@igalia.com
- Date
- 2016-03-28 13:59:56 -0700 (Mon, 28 Mar 2016)
Log Message
[CMake] Unreviewed build fix after r198736.
https://bugs.webkit.org/show_bug.cgi?id=155221
Unreviewed.
* CMakeLists.txt: Fix typo, add WebAutomationSession.cpp and declare _javascript_Core_SCRIPTS_DIR.
* WebProcess/Automation/WebAutomationSessionProxy.h: Add missing include.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (198756 => 198757)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-03-28 20:58:05 UTC (rev 198756)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-03-28 20:59:56 UTC (rev 198757)
@@ -466,6 +466,8 @@
UIProcess/Authentication/WebCredential.cpp
UIProcess/Authentication/WebProtectionSpace.cpp
+ UIProcess/Automation/WebAutomationSession.cpp
+
UIProcess/Databases/DatabaseProcessProxy.cpp
UIProcess/Downloads/DownloadProxy.cpp
@@ -750,6 +752,12 @@
WebKit2
)
+if (WIN32 AND INTERNAL_BUILD)
+ set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core/Scripts")
+else ()
+ set(_javascript_Core_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/Scripts")
+endif ()
+
# librt is needed for shm_open on Linux.
find_library(LIBRT_LIBRARIES NAMES rt)
mark_as_advanced(LIBRT_LIBRARIES)
@@ -815,7 +823,7 @@
VERBATIM)
list(APPEND WebKit2_HEADERS
- ${DERIVED_SOURCES_WEBKIT2_DIR}/WebauotmationSessionProxyScriptSource.h
+ ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h
)
WEBKIT_FRAMEWORK(WebKit2)
Modified: trunk/Source/WebKit2/ChangeLog (198756 => 198757)
--- trunk/Source/WebKit2/ChangeLog 2016-03-28 20:58:05 UTC (rev 198756)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-28 20:59:56 UTC (rev 198757)
@@ -1,3 +1,13 @@
+2016-03-28 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [CMake] Unreviewed build fix after r198736.
+ https://bugs.webkit.org/show_bug.cgi?id=155221
+
+ Unreviewed.
+
+ * CMakeLists.txt: Fix typo, add WebAutomationSession.cpp and declare _javascript_Core_SCRIPTS_DIR.
+ * WebProcess/Automation/WebAutomationSessionProxy.h: Add missing include.
+
2016-03-28 Alex Christensen <achristen...@webkit.org>
Use std::exchange for std::functions instead of WTFMove
Modified: trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.h (198756 => 198757)
--- trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.h 2016-03-28 20:58:05 UTC (rev 198756)
+++ trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.h 2016-03-28 20:59:56 UTC (rev 198757)
@@ -28,6 +28,7 @@
#include "Connection.h"
#include <_javascript_Core/JSBase.h>
+#include <wtf/text/WTFString.h>
namespace WebCore {
class Element;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
