Title: [98140] branches/safari-534.52-branch/Source/WebKit2
- Revision
- 98140
- Author
- lforsch...@apple.com
- Date
- 2011-10-21 13:54:22 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r94472.
Modified Paths
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98139 => 98140)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:52:16 UTC (rev 98139)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:54:22 UTC (rev 98140)
@@ -1,5 +1,18 @@
2011-10-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 94472
+
+ 2011-09-02 Michael Saboff <msab...@apple.com>
+
+ Fixed release build by removing #ifndef NDEBUG to
+ allow definition of gcController().
+
+ Rubber-stamp by Sam Weinig.
+
+ * WebProcess/WebProcess.cpp:
+
+2011-10-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 96765
2011-10-05 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp (98139 => 98140)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 20:52:16 UTC (rev 98139)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 20:54:22 UTC (rev 98140)
@@ -59,6 +59,7 @@
#include <WebCore/CrossOriginPreflightResultCache.h>
#include <WebCore/Font.h>
#include <WebCore/FontCache.h>
+#include <WebCore/GCController.h>
#include <WebCore/GlyphPageTreeNode.h>
#include <WebCore/IconDatabase.h>
#include <WebCore/JSDOMWindow.h>
@@ -78,10 +79,6 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RandomNumber.h>
-#ifndef NDEBUG
-#include <WebCore/GCController.h>
-#endif
-
#if !OS(WINDOWS)
#include <unistd.h>
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
