<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183986] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183986">183986</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-08 00:56:51 -0700 (Fri, 08 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/183945">r183945</a>.
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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkUtilitiescpp">trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkUtilitiesh">trunk/Source/WebCore/platform/gtk/GtkUtilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextgtkHyphenationLibHyphencpp">trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp">trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsergtkmainc">trunk/Tools/MiniBrowser/gtk/main.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/ChangeLog 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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
+
</ins><span class="cx"> 2015-05-07 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup after r183940
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebCore/ChangeLog 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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
+
</ins><span class="cx"> 2015-05-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Throttle RequestAnimationFrame in subframes that are outside the viewport
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> return gtk_widget_is_toplevel(widget) && GTK_IS_WINDOW(widget) && !GTK_IS_OFFSCREEN_WINDOW(widget);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> static CString topLevelPath()
</span><span class="cx"> {
</span><span class="cx"> if (const char* topLevelDirectory = g_getenv("WEBKIT_TOP_LEVEL"))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.h (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkUtilities.h 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.h 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> IntPoint convertWidgetPointToScreenPoint(GtkWidget*, const IntPoint&);
</span><span class="cx"> bool widgetIsOnscreenToplevelWindow(GtkWidget*);
</span><span class="cx">
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> CString webkitBuildDirectory();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextgtkHyphenationLibHyphencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> availableLocales.set(AtomicString(extractLocaleFromDictionaryFilePath(filePath)), filePath);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomicString, String>& availableLocales)
</span><span class="cx"> {
</span><span class="cx"> // It's unfortunate that we need to look for the dictionaries this way, but
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> for (size_t i = 0; i < WTF_ARRAY_LENGTH(gDictionaryDirectories); i++)
</span><span class="cx"> scanDirectoryForDicionaries(gDictionaryDirectories[i], availableLocales);
</span><span class="cx">
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> scanTestDictionariesDirectoryIfNecessary(availableLocales);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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
+
</ins><span class="cx"> 2015-05-07 Conrad Shultz <conrad_shultz@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't register for Lookup notifications until needed
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx">
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> #include <wtf/gobject/GlibUtilities.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> static String getExecutablePath()
</span><span class="cx"> {
</span><span class="cx"> CString executablePath = getCurrentExecutablePath();
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> static String findWebKitProcess(const char* processName)
</span><span class="cx"> {
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
</span><span class="cx"> if (execDirectory) {
</span><span class="cx"> String processPath = pathByAppendingComponent(filenameToString(execDirectory), processName);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> static const char* injectedBundleDirectory()
</span><span class="cx"> {
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH");
</span><span class="cx"> if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR))
</span><span class="cx"> return bundleDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebCore::TextCheckerEnchant> checker;
</span><span class="cx">
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> // This is a bit of a hack, but ensures that for testing purposes,
</span><span class="cx"> // spell checking is properly initialized in WebKitTestRunner while
</span><span class="cx"> // running layout tests. We should consider replacing this with some
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -76,6 +76,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
</span><span class="cx">
</span><ins>+# FIXME: There is no reason these should be different.
+SET_AND_EXPOSE_TO_BUILD(DEVELOPMENT_BUILD ${DEVELOPER_MODE})
</ins><span class="cx"> if (DEVELOPER_MODE)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Tools/ChangeLog 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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
+
</ins><span class="cx"> 2015-05-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fixes.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/main.c (183985 => 183986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/main.c 2015-05-08 06:51:55 UTC (rev 183985)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2015-05-08 07:56:51 UTC (rev 183986)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> int main(int argc, char *argv[])
</span><span class="cx"> {
</span><span class="cx"> gtk_init(&argc, &argv);
</span><del>-#if defined(DEVELOPER_MODE)
</del><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>