<!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>[180282] 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/180282">180282</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 12:08:15 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline unexported function build fixes
https://bugs.webkit.org/show_bug.cgi?id=141761
Patch by Alexey Proskuryakov <ap@apple.com> on 2015-02-18
Reviewed by Alex Christensen.
Source/WebCore:
* Configurations/WebCore.unexp: Added some functions for symbols only used on newer
OS versions. Removed a special case for NodeList, to handle it uniformly with Node.
* Configurations/WebCore.xcconfig: Made the unexported list unconditional, because
it's not only Xcode 5 that is affected.
* bindings/scripts/CodeGeneratorJS.pm: (GenerateHeader): We already had a hack for
Node, NodeList needs an exactly the same one. Also updated the comments.
Tools:
* Scripts/check-for-weak-vtables-and-externals: (readXcode5SymbolsToIgnore): Deleted.
We don't need to ignore symbols that are not exported due to the .unexp file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCoreunexp">trunk/Source/WebCore/Configurations/WebCore.unexp</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscheckforweakvtablesandexternals">trunk/Tools/Scripts/check-for-weak-vtables-and-externals</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180281 => 180282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-18 20:05:11 UTC (rev 180281)
+++ trunk/Source/WebCore/ChangeLog 2015-02-18 20:08:15 UTC (rev 180282)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-18 Alexey Proskuryakov <ap@apple.com>
+
+ Streamline unexported function build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=141761
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/WebCore.unexp: Added some functions for symbols only used on newer
+ OS versions. Removed a special case for NodeList, to handle it uniformly with Node.
+
+ * Configurations/WebCore.xcconfig: Made the unexported list unconditional, because
+ it's not only Xcode 5 that is affected.
+
+ * bindings/scripts/CodeGeneratorJS.pm: (GenerateHeader): We already had a hack for
+ Node, NodeList needs an exactly the same one. Also updated the comments.
+
</ins><span class="cx"> 2015-02-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Access FontCache global instance via singleton() static member function
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCoreunexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.unexp (180281 => 180282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.unexp 2015-02-18 20:05:11 UTC (rev 180281)
+++ trunk/Source/WebCore/Configurations/WebCore.unexp 2015-02-18 20:08:15 UTC (rev 180282)
</span><span class="lines">@@ -87,9 +87,23 @@
</span><span class="cx"> # Function marked ALWAYS_INLINE in header, but may not be inlined in a
</span><span class="cx"> # Debug build.
</span><span class="cx">
</span><del>-# Source/WebCore/bindings/js/JSNodeListCustom.h
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_8NodeListE
</del><ins>+# Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
+_CMFormatDescriptionGetMediaSubType
+_CMFormatDescriptionGetMediaType
+_CMSampleBufferCreateCopy
+_CMSampleBufferCreateCopyWithNewTiming
+_CMSampleBufferGetDecodeTimeStamp
+_CMSampleBufferGetDuration
+_CMSampleBufferGetPresentationTimeStamp
+_CMSampleBufferGetSampleAttachmentsArray
+_CMSampleBufferGetSampleTimingInfoArray
+_CMSampleBufferGetTotalSampleSize
+_CMVideoFormatDescriptionGetPresentationDimensions
</ins><span class="cx">
</span><ins>+# Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp
+_DDDFAScannerCreateFromCache
+_DDDFAScannerFirstResultInUnicharArray
+
</ins><span class="cx"> # Subclasses of an exported C++ class in JavaScriptCore.
</span><span class="cx">
</span><span class="cx"> # Source/JavaScriptCore/inspector/ScriptDebugServer.h
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (180281 => 180282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-02-18 20:05:11 UTC (rev 180281)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-02-18 20:08:15 UTC (rev 180282)
</span><span class="lines">@@ -51,8 +51,7 @@
</span><span class="cx"> INSTALLHDRS_COPY_PHASE = YES;
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx"> PRODUCT_NAME = WebCore;
</span><del>-UNEXPORTED_SYMBOLS_FILE_xcode_0500 = Configurations/WebCore.unexp;
-UNEXPORTED_SYMBOLS_FILE = $(UNEXPORTED_SYMBOLS_FILE_xcode_$(XCODE_VERSION_MAJOR));
</del><ins>+UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp;
</ins><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM);
</span><span class="cx"> OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
</span><span class="cx"> OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (180281 => 180282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-02-18 20:05:11 UTC (rev 180281)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-02-18 20:08:15 UTC (rev 180282)
</span><span class="lines">@@ -1149,8 +1149,9 @@
</span><span class="cx"> push(@headerContent, "\n");
</span><span class="cx"> }
</span><span class="cx"> if (ShouldGenerateToJSDeclaration($hasParent, $interface)) {
</span><del>- # Node needs to not be exported, others need to be exported.
- if ($implType eq "Node") {
</del><ins>+ # Node and NodeList have custom inline implementations which thus cannot be exported.
+ # FIXME: The special case for Node and NodeList should probably be implemented via an IDL attribute.
+ if ($implType eq "Node" or $implType eq "NodeList") {
</ins><span class="cx"> push(@headerContent, "JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, $implType*);\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@headerContent, "WEBCORE_EXPORT JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, $implType*);\n");
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180281 => 180282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-18 20:05:11 UTC (rev 180281)
+++ trunk/Tools/ChangeLog 2015-02-18 20:08:15 UTC (rev 180282)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-18 Alexey Proskuryakov <ap@apple.com>
+
+ Streamline unexported function build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=141761
+
+ Reviewed by Alex Christensen.
+
+ * Scripts/check-for-weak-vtables-and-externals: (readXcode5SymbolsToIgnore): Deleted.
+ We don't need to ignore symbols that are not exported due to the .unexp file.
+
</ins><span class="cx"> 2015-02-18 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove more references to WebCore.exp.in
</span></span></pre></div>
<a id="trunkToolsScriptscheckforweakvtablesandexternals"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/check-for-weak-vtables-and-externals (180281 => 180282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/check-for-weak-vtables-and-externals 2015-02-18 20:05:11 UTC (rev 180281)
+++ trunk/Tools/Scripts/check-for-weak-vtables-and-externals 2015-02-18 20:08:15 UTC (rev 180282)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> use lib $FindBin::Bin;
</span><span class="cx"> use webkitdirs;
</span><span class="cx">
</span><del>-sub readXcode5SymbolsToIgnore();
</del><span class="cx"> sub touch($);
</span><span class="cx">
</span><span class="cx"> my $arch = $ENV{'CURRENT_ARCH'};
</span><span class="lines">@@ -65,8 +64,6 @@
</span><span class="cx"> }
</span><span class="cx"> my @weakVTableClasses = ();
</span><span class="cx"> my @weakExternalSymbols = ();
</span><del>- my $isXcode5 = $ENV{'XCODE_VERSION_MAJOR'} eq "0500";
- my $ignoreXcode5SymbolsRegex = $isXcode5 ? "(" . join("|", grep(quotemeta($_), readXcode5SymbolsToIgnore())) . ")" : undef;
</del><span class="cx"> while (<NM>) {
</span><span class="cx"> if (/^STDOUT:/) {
</span><span class="cx"> # Ignore undefined, RTTI and typeinfo symbols.
</span><span class="lines">@@ -75,9 +72,6 @@
</span><span class="cx"> # ASan compiler-rt calls into __asan_mapping_offset and __asan_mapping_scale
</span><span class="cx"> next if /\b___asan/;
</span><span class="cx">
</span><del>- # Symbols that need to be ignored when building with Xcode 5.x.
- next if $isXcode5 && /\b${ignoreXcode5SymbolsRegex}\b/;
-
</del><span class="cx"> if (/weak external vtable for (.*)$/) {
</span><span class="cx"> push @weakVTableClasses, $1;
</span><span class="cx"> } elsif (/weak external (.*)$/) {
</span><span class="lines">@@ -121,24 +115,6 @@
</span><span class="cx">
</span><span class="cx"> exit 0;
</span><span class="cx">
</span><del>-sub readXcode5SymbolsToIgnore()
-{
- my $unexportFile = "Source/WebCore/Configurations/WebCore.unexp";
-
- open(SYMBOLS, File::Spec->catfile(sourceDir(), $unexportFile)) or die "$!";
-
- my @result;
- while (<SYMBOLS>) {
- s/#.*$//;
- s/^\s+|\s+$//g;
- push(@result, $_) if $_;
- }
-
- close(SYMBOLS);
-
- return @result;
-}
-
</del><span class="cx"> sub touch($)
</span><span class="cx"> {
</span><span class="cx"> my ($path) = @_;
</span></span></pre>
</div>
</div>
</body>
</html>