Title: [199109] trunk
- Revision
- 199109
- Author
- achristen...@apple.com
- Date
- 2016-04-06 12:07:59 -0700 (Wed, 06 Apr 2016)
Log Message
Fix CMake DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=156305
Reviewed by Daniel Bates.
.:
* Source/cmake/OptionsMac.cmake:
Source/WebKit:
* PlatformMac.cmake:
Source/WebKit/mac:
* WebKitPrefix.h:
Modified Paths
Diff
Modified: trunk/ChangeLog (199108 => 199109)
--- trunk/ChangeLog 2016-04-06 18:49:54 UTC (rev 199108)
+++ trunk/ChangeLog 2016-04-06 19:07:59 UTC (rev 199109)
@@ -1,3 +1,12 @@
+2016-04-06 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=156305
+
+ Reviewed by Daniel Bates.
+
+ * Source/cmake/OptionsMac.cmake:
+
2016-04-05 Alex Christensen <achristen...@webkit.org>
Make CMake-generated binaries on Mac able to run
Modified: trunk/Source/WebKit/ChangeLog (199108 => 199109)
--- trunk/Source/WebKit/ChangeLog 2016-04-06 18:49:54 UTC (rev 199108)
+++ trunk/Source/WebKit/ChangeLog 2016-04-06 19:07:59 UTC (rev 199109)
@@ -1,3 +1,12 @@
+2016-04-06 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=156305
+
+ Reviewed by Daniel Bates.
+
+ * PlatformMac.cmake:
+
2016-04-05 Alex Christensen <achristen...@webkit.org>
Make CMake-generated binaries on Mac able to run
Modified: trunk/Source/WebKit/PlatformMac.cmake (199108 => 199109)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-04-06 18:49:54 UTC (rev 199108)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-04-06 19:07:59 UTC (rev 199109)
@@ -15,6 +15,7 @@
"${WEBCORE_DIR}/bridge/jsc"
"${WEBCORE_DIR}/bridge/objc"
"${WEBCORE_DIR}/ForwardingHeaders/inspector"
+ "${WEBCORE_DIR}/html/track"
"${WEBCORE_DIR}/loader/archive/cf"
"${WEBCORE_DIR}/loader/cf"
"${WEBCORE_DIR}/loader/mac"
@@ -38,6 +39,7 @@
"${WEBCORE_DIR}/platform/text/cf"
"${WEBCORE_DIR}/platform/text/mac"
"${WEBCORE_DIR}/plugins/mac"
+ "${WEBCORE_DIR}/rendering/shapes"
"${WTF_DIR}"
../../WebKitLibraries
)
@@ -148,6 +150,7 @@
mac/Storage/WebDatabaseManager.mm
mac/Storage/WebDatabaseManagerClient.mm
+ mac/Storage/WebDatabaseProvider.mm
mac/Storage/WebDatabaseQuotaManager.mm
mac/Storage/WebStorageManager.mm
mac/Storage/WebStorageTrackerClient.mm
@@ -176,6 +179,7 @@
mac/WebCoreSupport/WebPlatformStrategies.mm
mac/WebCoreSupport/WebProgressTrackerClient.mm
mac/WebCoreSupport/WebSecurityOrigin.mm
+ mac/WebCoreSupport/WebSelectionServiceController.mm
mac/WebCoreSupport/WebSystemInterface.mm
mac/WebCoreSupport/WebUserMediaClient.mm
mac/WebCoreSupport/WebVisitedLinkStore.mm
Modified: trunk/Source/WebKit/mac/ChangeLog (199108 => 199109)
--- trunk/Source/WebKit/mac/ChangeLog 2016-04-06 18:49:54 UTC (rev 199108)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-06 19:07:59 UTC (rev 199109)
@@ -1,3 +1,12 @@
+2016-04-06 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=156305
+
+ Reviewed by Daniel Bates.
+
+ * WebKitPrefix.h:
+
2016-04-05 Beth Dakin <bda...@apple.com>
Make requestCandidatesForSelection available on any EditorClient
Modified: trunk/Source/WebKit/mac/WebKitPrefix.h (199108 => 199109)
--- trunk/Source/WebKit/mac/WebKitPrefix.h 2016-04-06 18:49:54 UTC (rev 199108)
+++ trunk/Source/WebKit/mac/WebKitPrefix.h 2016-04-06 19:07:59 UTC (rev 199109)
@@ -26,6 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
+#include "cmakeconfig.h"
+#endif
+
#include <TargetConditionals.h>
#ifdef __cplusplus
Modified: trunk/Source/cmake/OptionsMac.cmake (199108 => 199109)
--- trunk/Source/cmake/OptionsMac.cmake 2016-04-06 18:49:54 UTC (rev 199108)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-04-06 19:07:59 UTC (rev 199109)
@@ -55,7 +55,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_TEXT_AUTOSIZING PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_TEXT_AUTOSIZING PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_NOTIFICATIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_VENDOR_PREFIXES PRIVATE ON)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
