- Revision
- 184010
- Author
- [email protected]
- Date
- 2015-05-08 13:29:45 -0700 (Fri, 08 May 2015)
Log Message
.:
015-05-08 Michael Catanzaro <[email protected]>, Martin Robinson <[email protected]>
[GTK] Checks for DEVELOPMENT_BUILD are all wrong
https://bugs.webkit.org/show_bug.cgi?id=144746
Reviewed by Carlos Garcia Campos.
Don't set DEVELOPMENT_BUILD. We check whether it is defined for conditional compilation, not
what it is defined to, so defining it to 0 effectively turned it on always. Instead set
ENABLE_DEVELOPER_MODE so that we can use the ENABLE macro inside WebKit source code.
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
[GTK] Checks for DEVELOPMENT_BUILD are all wrong
https://bugs.webkit.org/show_bug.cgi?id=144746
Reviewed by Carlos Garcia Campos.
Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.
* platform/gtk/GtkUtilities.cpp:
* platform/gtk/GtkUtilities.h:
* platform/text/gtk/HyphenationLibHyphen.cpp:
(WebCore::availableLocales):
Source/WebKit2:
[GTK] Checks for DEVELOPMENT_BUILD are all wrong
https://bugs.webkit.org/show_bug.cgi?id=144746
Reviewed by Carlos Garcia Campos.
Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::findWebKitProcess):
* UIProcess/API/gtk/WebKitWebContext.cpp:
(injectedBundleDirectory):
* UIProcess/gtk/TextCheckerGtk.cpp:
(WebKit::enchantTextChecker):
Tools:
015-05-08 Michael Catanzaro <[email protected]>, Martin Robinson <[email protected]>
[GTK] Checks for DEVELOPMENT_BUILD are all wrong
https://bugs.webkit.org/show_bug.cgi?id=144746
Reviewed by Carlos Garcia Campos.
Use ENABLE_DEVELOPER_MODE rather than DEVELOPMENT_BUILD.
* MiniBrowser/gtk/main.c:
(main):
Modified Paths
Diff
Modified: trunk/ChangeLog (184009 => 184010)
--- trunk/ChangeLog 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/ChangeLog 2015-05-08 20:29:45 UTC (rev 184010)
@@ -1,3 +1,16 @@
+015-05-08 Michael Catanzaro <[email protected]>, Martin Robinson <[email protected]>
+
+ [GTK] Checks for DEVELOPMENT_BUILD are all wrong
+ https://bugs.webkit.org/show_bug.cgi?id=144746
+
+ Reviewed by Carlos Garcia Campos.
+
+ Don't set DEVELOPMENT_BUILD. We check whether it is defined for conditional compilation, not
+ what it is defined to, so defining it to 0 effectively turned it on always. Instead set
+ ENABLE_DEVELOPER_MODE so that we can use the ENABLE macro inside WebKit source code.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2015-05-08 Daniel Bates <[email protected]>
[iOS] WebSQL operations are not performed after device is locked
Modified: trunk/Source/WebCore/ChangeLog (184009 => 184010)
--- trunk/Source/WebCore/ChangeLog 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebCore/ChangeLog 2015-05-08 20:29:45 UTC (rev 184010)
@@ -1,3 +1,17 @@
+2015-05-08 Michael Catanzaro <[email protected]>, Martin Robinson <[email protected]>
+
+ [GTK] Checks for DEVELOPMENT_BUILD are all wrong
+ https://bugs.webkit.org/show_bug.cgi?id=144746
+
+ Reviewed by Carlos Garcia Campos.
+
+ Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.
+
+ * platform/gtk/GtkUtilities.cpp:
+ * platform/gtk/GtkUtilities.h:
+ * platform/text/gtk/HyphenationLibHyphen.cpp:
+ (WebCore::availableLocales):
+
2015-05-08 Alexey Proskuryakov <[email protected]>
Crashes in SocketStreamHandleBase::close
Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp (184009 => 184010)
--- trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2015-05-08 20:29:45 UTC (rev 184010)
@@ -54,7 +54,7 @@
return gtk_widget_is_toplevel(widget) && GTK_IS_WINDOW(widget) && !GTK_IS_OFFSCREEN_WINDOW(widget);
}
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
static CString topLevelPath()
{
if (const char* topLevelDirectory = g_getenv("WEBKIT_TOP_LEVEL"))
Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.h (184009 => 184010)
--- trunk/Source/WebCore/platform/gtk/GtkUtilities.h 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.h 2015-05-08 20:29:45 UTC (rev 184010)
@@ -28,7 +28,7 @@
IntPoint convertWidgetPointToScreenPoint(GtkWidget*, const IntPoint&);
bool widgetIsOnscreenToplevelWindow(GtkWidget*);
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
CString webkitBuildDirectory();
#endif
Modified: trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp (184009 => 184010)
--- trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp 2015-05-08 20:29:45 UTC (rev 184010)
@@ -63,7 +63,7 @@
availableLocales.set(AtomicString(extractLocaleFromDictionaryFilePath(filePath)), filePath);
}
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomicString, String>& availableLocales)
{
// It's unfortunate that we need to look for the dictionaries this way, but
@@ -91,7 +91,7 @@
for (size_t i = 0; i < WTF_ARRAY_LENGTH(gDictionaryDirectories); i++)
scanDirectoryForDicionaries(gDictionaryDirectories[i], availableLocales);
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
scanTestDictionariesDirectoryIfNecessary(availableLocales);
#endif
Modified: trunk/Source/WebKit2/ChangeLog (184009 => 184010)
--- trunk/Source/WebKit2/ChangeLog 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-08 20:29:45 UTC (rev 184010)
@@ -1,3 +1,19 @@
+2015-05-08 Michael Catanzaro <[email protected]>, Martin Robinson <[email protected]>
+
+ [GTK] Checks for DEVELOPMENT_BUILD are all wrong
+ https://bugs.webkit.org/show_bug.cgi?id=144746
+
+ Reviewed by Carlos Garcia Campos.
+
+ Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.
+
+ * Shared/gtk/ProcessExecutablePathGtk.cpp:
+ (WebKit::findWebKitProcess):
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (injectedBundleDirectory):
+ * UIProcess/gtk/TextCheckerGtk.cpp:
+ (WebKit::enchantTextChecker):
+
2015-05-08 Anders Carlsson <[email protected]>
Fix ProcessLauncher port leak
Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (184009 => 184010)
--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-05-08 20:29:45 UTC (rev 184010)
@@ -30,7 +30,7 @@
#include <WebCore/FileSystem.h>
#include <glib.h>
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
#include <wtf/gobject/GlibUtilities.h>
#endif
@@ -38,7 +38,7 @@
namespace WebKit {
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
static String getExecutablePath()
{
CString executablePath = getCurrentExecutablePath();
@@ -50,7 +50,7 @@
static String findWebKitProcess(const char* processName)
{
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
if (execDirectory) {
String processPath = pathByAppendingComponent(filenameToString(execDirectory), processName);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (184009 => 184010)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-08 20:29:45 UTC (rev 184010)
@@ -216,7 +216,7 @@
static const char* injectedBundleDirectory()
{
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH");
if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR))
return bundleDirectory;
Modified: trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp (184009 => 184010)
--- trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-05-08 20:29:45 UTC (rev 184010)
@@ -44,7 +44,7 @@
{
static NeverDestroyed<WebCore::TextCheckerEnchant> checker;
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE(DEVELOPER_MODE)
// This is a bit of a hack, but ensures that for testing purposes,
// spell checking is properly initialized in WebKitTestRunner while
// running layout tests. We should consider replacing this with some
Modified: trunk/Source/cmake/OptionsGTK.cmake (184009 => 184010)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-05-08 20:29:45 UTC (rev 184010)
@@ -76,8 +76,7 @@
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
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})
+SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
if (DEVELOPER_MODE)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
Modified: trunk/Tools/ChangeLog (184009 => 184010)
--- trunk/Tools/ChangeLog 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Tools/ChangeLog 2015-05-08 20:29:45 UTC (rev 184010)
@@ -1,3 +1,15 @@
+015-05-08 Michael Catanzaro <[email protected]>, Martin Robinson <[email protected]>
+
+ [GTK] Checks for DEVELOPMENT_BUILD are all wrong
+ https://bugs.webkit.org/show_bug.cgi?id=144746
+
+ Reviewed by Carlos Garcia Campos.
+
+ Use ENABLE_DEVELOPER_MODE rather than DEVELOPMENT_BUILD.
+
+ * MiniBrowser/gtk/main.c:
+ (main):
+
2015-05-08 Commit Queue <[email protected]>
Unreviewed, rolling out r183996.
Modified: trunk/Tools/MiniBrowser/gtk/main.c (184009 => 184010)
--- trunk/Tools/MiniBrowser/gtk/main.c 2015-05-08 20:07:29 UTC (rev 184009)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2015-05-08 20:29:45 UTC (rev 184010)
@@ -256,7 +256,7 @@
int main(int argc, char *argv[])
{
gtk_init(&argc, &argv);
-#if defined(DEVELOPMENT_BUILD)
+#if ENABLE_DEVELOPER_MODE
g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
#endif
