Changeset 183986 in webkit

Timestamp:

May 8, 2015, 12:56:51 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r183945.
​https://bugs.webkit.org/show_bug.cgi?id=144789

"It broke all the GTK+ tests" (Requested by KaL on #webkit).

Reverted changeset:

"[GTK] Checks for DEVELOPMENT_BUILD are all wrong"
​https://bugs.webkit.org/show_bug.cgi?id=144746
​http://trac.webkit.org/changeset/183945

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/gtk/GtkUtilities.cpp (modified) (1 diff)
• Source/WebCore/platform/gtk/GtkUtilities.h (modified) (1 diff)
• Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (modified) (3 diffs)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/gtk/main.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2015-05-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183945.
+        https://bugs.webkit.org/show_bug.cgi?id=144789
+
+        "It broke all the GTK+ tests" (Requested by KaL on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Checks for DEVELOPMENT_BUILD are all wrong"
+        https://bugs.webkit.org/show_bug.cgi?id=144746
+        http://trac.webkit.org/changeset/183945
+
 2015-05-07  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183945.
+        https://bugs.webkit.org/show_bug.cgi?id=144789
+
+        "It broke all the GTK+ tests" (Requested by KaL on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Checks for DEVELOPMENT_BUILD are all wrong"
+        https://bugs.webkit.org/show_bug.cgi?id=144746
+        http://trac.webkit.org/changeset/183945
+
 2015-05-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp

@@ -55 +55 @@
 }
 
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
 static CString topLevelPath()
 {

trunk/Source/WebCore/platform/gtk/GtkUtilities.h

@@ -29 +29 @@
 bool widgetIsOnscreenToplevelWindow(GtkWidget*);
 
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
 CString webkitBuildDirectory();
 #endif

trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp

@@ -64 +64 @@
 }
 
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
 static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomicString, String>& availableLocales)
 {
@@ -92 +92 @@
             scanDirectoryForDicionaries(gDictionaryDirectories[i], availableLocales);
 
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
         scanTestDictionariesDirectoryIfNecessary(availableLocales);
 #endif

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183945.
+        https://bugs.webkit.org/show_bug.cgi?id=144789
+
+        "It broke all the GTK+ tests" (Requested by KaL on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Checks for DEVELOPMENT_BUILD are all wrong"
+        https://bugs.webkit.org/show_bug.cgi?id=144746
+        http://trac.webkit.org/changeset/183945
+
 2015-05-07  Conrad Shultz  <conrad_shultz@apple.com>
 

trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp

@@ -31 +31 @@
 #include <glib.h>
 
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
 #include <wtf/gobject/GlibUtilities.h>
 #endif
@@ -39 +39 @@
 namespace WebKit {
 
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
 static String getExecutablePath()
 {
@@ -51 +51 @@
 static String findWebKitProcess(const char* processName)
 {
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
     static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
     if (execDirectory) {

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -217 +217 @@
 static const char* injectedBundleDirectory()
 {
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
     const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH");
     if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR))

trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp

@@ -45 +45 @@
     static NeverDestroyed<WebCore::TextCheckerEnchant> checker;
 
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
     // This is a bit of a hack, but ensures that for testing purposes,
     // spell checking is properly initialized in WebKitTestRunner while

trunk/Source/cmake/OptionsGTK.cmake

@@ -77 +77 @@
 WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
 
+# FIXME: There is no reason these should be different.
+SET_AND_EXPOSE_TO_BUILD(DEVELOPMENT_BUILD ${DEVELOPER_MODE})
 if (DEVELOPER_MODE)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-05-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183945.
+        https://bugs.webkit.org/show_bug.cgi?id=144789
+
+        "It broke all the GTK+ tests" (Requested by KaL on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Checks for DEVELOPMENT_BUILD are all wrong"
+        https://bugs.webkit.org/show_bug.cgi?id=144746
+        http://trac.webkit.org/changeset/183945
+
 2015-05-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/MiniBrowser/gtk/main.c

@@ -257 +257 @@
 {
     gtk_init(&argc, &argv);
-#if defined(DEVELOPER_MODE)
+#if defined(DEVELOPMENT_BUILD)
     g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
 #endif