<!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>[173283] 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/173283">173283</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-09-04 14:36:14 -0700 (Thu, 04 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
https://bugs.webkit.org/show_bug.cgi?id=136521
Reviewed by Anders Carlsson.
Source/WebCore:
* platform/ios/wak/WebCoreThread.h: Stopped defining WEBCORE_EXPORT.
Source/WebKit/mac:
Taught MigrateHeaders.make to remove WEBCORE_EXPORT from headers using this sed expression:
s/(^ *)WEBCORE_EXPORT /\1/g
This removes WEBCORE_EXPORT and a single following space character but preserves preceeding whitespace.
* MigrateHeaders.make:
Source/WebKit2:
* config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.
Tools:
* DumpRenderTree/config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.
* TestWebKitAPI/config.h: Ditto.
* WebKitTestRunner/config.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWebCoreThreadh">trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2configh">trunk/Source/WebKit2/config.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeconfigh">trunk/Tools/DumpRenderTree/config.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIconfigh">trunk/Tools/TestWebKitAPI/config.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerconfigh">trunk/Tools/WebKitTestRunner/config.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Source/WebCore/ChangeLog 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-09-03 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
+ https://bugs.webkit.org/show_bug.cgi?id=136521
+
+ Reviewed by Anders Carlsson.
+
+ * platform/ios/wak/WebCoreThread.h: Stopped defining WEBCORE_EXPORT.
+
</ins><span class="cx"> 2014-09-03 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Initial letters should clear one another.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWebCoreThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -30,11 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><span class="cx">
</span><del>-/* For a project that uses WebCore but has no config.h, we need to explicitly set the export define here. */
-#ifndef WEBCORE_EXPORT
-#define WEBCORE_EXPORT
-#endif
-
</del><span class="cx"> #if defined(__cplusplus)
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-03 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
+ https://bugs.webkit.org/show_bug.cgi?id=136521
+
+ Reviewed by Anders Carlsson.
+
+ Taught MigrateHeaders.make to remove WEBCORE_EXPORT from headers using this sed expression:
+
+ s/(^ *)WEBCORE_EXPORT /\1/g
+
+ This removes WEBCORE_EXPORT and a single following space character but preserves preceeding whitespace.
+
+ * MigrateHeaders.make:
+
</ins><span class="cx"> 2014-09-04 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove WebCoreSystemInterface glue for otherwise unused WKSI calls
</span></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -241,8 +241,8 @@
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/
-WEBCORE_HEADER_MIGRATE_CMD = sed $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
</del><ins>+WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/ -e "s/(^ *)WEBCORE_EXPORT /\1/"
+WEBCORE_HEADER_MIGRATE_CMD = sed -E $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
</ins><span class="cx">
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
</span><span class="cx"> $(WEBCORE_HEADER_MIGRATE_CMD)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-09-03 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
+ https://bugs.webkit.org/show_bug.cgi?id=136521
+
+ Reviewed by Anders Carlsson.
+
+ * config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.
+
</ins><span class="cx"> 2014-09-04 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove WebCoreSystemInterface glue for otherwise unused WKSI calls
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Source/WebKit2/config.h 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -30,13 +30,11 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx">
</span><ins>+#include <WebCore/PlatformExportMacros.h>
</ins><span class="cx"> #include <runtime/JSExportMacros.h>
</span><span class="cx"> #include <wtf/DisallowCType.h>
</span><span class="cx"> #include <wtf/ExportMacros.h>
</span><span class="cx">
</span><del>-// This is needed because we include WebCore's headers.
-#define WEBCORE_EXPORT
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> #ifndef EXTERN_C_BEGIN
</span><span class="cx"> #define EXTERN_C_BEGIN extern "C" {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Tools/ChangeLog 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-09-03 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
+ https://bugs.webkit.org/show_bug.cgi?id=136521
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.
+ * TestWebKitAPI/config.h: Ditto.
+ * WebKitTestRunner/config.h: Ditto.
+
</ins><span class="cx"> 2014-09-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Dashboard metrics page aggregation counts performance bots
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/config.h (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/config.h 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Tools/DumpRenderTree/config.h 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -24,15 +24,11 @@
</span><span class="cx"> #include "cmakeconfig.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#include <WebCore/PlatformExportMacros.h>
</ins><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx"> #include <wtf/ExportMacros.h>
</span><span class="cx"> #include <runtime/JSExportMacros.h>
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) || PLATFORM(IOS)
-// This is needed because we include WebCore's headers.
-#define WEBCORE_EXPORT
-#endif
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> #undef new
</span><span class="cx"> #undef delete
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/config.h (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/config.h 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Tools/TestWebKitAPI/config.h 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -27,13 +27,11 @@
</span><span class="cx"> #include "cmakeconfig.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#include <WebCore/PlatformExportMacros.h>
</ins><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx"> #include <wtf/ExportMacros.h>
</span><span class="cx"> #include <runtime/JSExportMacros.h>
</span><span class="cx">
</span><del>-// This is needed because we include WebCore's headers.
-#define WEBCORE_EXPORT
-
</del><span class="cx"> #if defined(__APPLE__) && __APPLE__
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/config.h (173282 => 173283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/config.h 2014-09-04 21:23:38 UTC (rev 173282)
+++ trunk/Tools/WebKitTestRunner/config.h 2014-09-04 21:36:14 UTC (rev 173283)
</span><span class="lines">@@ -29,12 +29,10 @@
</span><span class="cx"> #include "cmakeconfig.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#include <WebCore/PlatformExportMacros.h>
</ins><span class="cx"> #include <WebKit/WebKit2_C.h>
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx"> #include <wtf/ExportMacros.h>
</span><span class="cx"> #include <runtime/JSExportMacros.h>
</span><span class="cx">
</span><del>-// This is needed because we include WebCore's headers.
-#define WEBCORE_EXPORT
-
</del><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>