<!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>[180135] 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/180135">180135</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-02-15 20:13:21 -0800 (Sun, 15 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/180082">r180082</a>): WebCore Debug builds fail on Mavericks due to weak export symbols
<http://webkit.org/b/141607>
Source/WebCore:
This should fix the build, but leaves a FIXME list in
WebCore.unexp.
* Configurations/WebCore.unexp: Add weak externals with a FIXME
statement so they can be removed later. It's more important to
fix the build first.
* Configurations/WebCore.xcconfig: Change XCODE_VERSION_MINOR to
XCODE_VERSION_MAJOR since the internal bots use version 5.1.1
which still has the error.
Tools:
* Scripts/check-for-weak-vtables-and-externals: Ignore weak
externals in Source/WebCore/Configurations/WebCore.unexp when
building with Xcode 5.x.
(readXcode5SymbolsToIgnore): Add.</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="#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 (180134 => 180135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-16 03:13:01 UTC (rev 180134)
+++ trunk/Source/WebCore/ChangeLog        2015-02-16 04:13:21 UTC (rev 180135)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-15 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r180082): WebCore Debug builds fail on Mavericks due to weak export symbols
+ <http://webkit.org/b/141607>
+
+ This should fix the build, but leaves a FIXME list in
+ WebCore.unexp.
+
+ * Configurations/WebCore.unexp: Add weak externals with a FIXME
+ statement so they can be removed later. It's more important to
+ fix the build first.
+
+ * Configurations/WebCore.xcconfig: Change XCODE_VERSION_MINOR to
+ XCODE_VERSION_MAJOR since the internal bots use version 5.1.1
+ which still has the error.
+
</ins><span class="cx"> 2015-02-15 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: remove unused XHR replay code
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCoreunexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.unexp (180134 => 180135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.unexp        2015-02-16 03:13:01 UTC (rev 180134)
+++ trunk/Source/WebCore/Configurations/WebCore.unexp        2015-02-16 04:13:21 UTC (rev 180135)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# These symbols should only be needed to build with Xcode 5.0.x.
</del><ins>+# These symbols should only be needed to build with Xcode 5.x.
</ins><span class="cx"> # This should be removed once we no longer need to build with those versions.
</span><span class="cx">
</span><span class="cx"> __ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE
</span><span class="lines">@@ -15,3 +15,84 @@
</span><span class="cx"> __ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE
</span><span class="cx"> __ZTVNSt3__119basic_istringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE
</span><span class="cx"> __ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE
</span><ins>+
+# FIXME: The following symbols only appear in Debug builds with Xcode 5.x.
+# They should be removed from this list after determining how to remove the
+# weak externals from WebCore.
+
+# Soft-linked functions in source files. Most probably have
+# __attribute__((visibility("default"))) declared in the original header
+# file, so if the compiler doesn't inline the redeclared method in the
+# SOFT_LINK() macro, it gets exported from WebCore.
+
+# Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
+_AudioConverterConvertComplexBuffer
+_AudioConverterNew
+_CMTimebaseGetTime
+_MTAudioProcessingTapGetSourceAudio
+_MTAudioProcessingTapGetStorage
+
+# Source/WebCore/platform/mac/PlatformClockCM.mm
+_CMAudioDeviceClockCreate
+_CMTimeGetSeconds
+_CMTimebaseCreateWithMasterClock
+_CMTimebaseSetRate
+_CMTimebaseSetTime
+
+# Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
+_CMBlockBufferCopyDataBytes
+_CMBlockBufferGetDataLength
+_CMFormatDescriptionGetExtensions
+_CMSampleBufferGetDataBuffer
+_CMSampleBufferGetFormatDescription
+_CMSampleBufferGetSampleTimingInfo
+
+# Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
+_CMTimeCompare
+_CMTimeMake
+
+# Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
+_CMTimeMakeWithSeconds
+_CMTimeRangeGetEnd
+
+# Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
+_MACaptionAppearanceAddSelectedLanguage
+_MACaptionAppearanceCopyBackgroundColor
+_MACaptionAppearanceCopyFontDescriptorForStyle
+_MACaptionAppearanceCopyForegroundColor
+_MACaptionAppearanceCopyPreferredCaptioningMediaCharacteristics
+_MACaptionAppearanceCopySelectedLanguages
+_MACaptionAppearanceCopyWindowColor
+_MACaptionAppearanceGetBackgroundOpacity
+_MACaptionAppearanceGetDisplayType
+_MACaptionAppearanceGetForegroundOpacity
+_MACaptionAppearanceGetRelativeCharacterSize
+_MACaptionAppearanceGetTextEdgeStyle
+_MACaptionAppearanceGetWindowOpacity
+_MACaptionAppearanceGetWindowRoundedCornerRadius
+_MACaptionAppearanceSetDisplayType
+
+# Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
+_CVPixelBufferGetBaseAddress
+_CVPixelBufferGetBytesPerRow
+_CVPixelBufferGetDataSize
+_CVPixelBufferGetHeight
+_CVPixelBufferGetPixelFormatType
+_CVPixelBufferGetWidth
+_CVPixelBufferLockBaseAddress
+_CVPixelBufferUnlockBaseAddress
+_VTPixelTransferSessionCreate
+_VTPixelTransferSessionTransferImage
+
+# Function marked ALWAYS_INLINE in header, but may not be inlined in a
+# Debug build.
+
+# Source/WebCore/bindings/js/JSNodeListCustom.h
+__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_8NodeListE
+
+# Subclasses of an exported C++ class in JavaScriptCore.
+
+# Source/JavaScriptCore/inspector/ScriptDebugServer.h
+__ZTVN9Inspector17ScriptDebugServer4TaskE
+# Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
+__ZTVN9Inspector22InspectorDebuggerAgent8ListenerE
</ins></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (180134 => 180135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig        2015-02-16 03:13:01 UTC (rev 180134)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig        2015-02-16 04:13:21 UTC (rev 180135)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx"> PRODUCT_NAME = WebCore;
</span><span class="cx"> UNEXPORTED_SYMBOLS_FILE_xcode_0500 = Configurations/WebCore.unexp;
</span><del>-UNEXPORTED_SYMBOLS_FILE = $(UNEXPORTED_SYMBOLS_FILE_xcode_$(XCODE_VERSION_MINOR));
</del><ins>+UNEXPORTED_SYMBOLS_FILE = $(UNEXPORTED_SYMBOLS_FILE_xcode_$(XCODE_VERSION_MAJOR));
</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="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180134 => 180135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-02-16 03:13:01 UTC (rev 180134)
+++ trunk/Tools/ChangeLog        2015-02-16 04:13:21 UTC (rev 180135)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-15 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r180082): WebCore Debug builds fail on Mavericks due to weak export symbols
+ <http://webkit.org/b/141607>
+
+ * Scripts/check-for-weak-vtables-and-externals: Ignore weak
+ externals in Source/WebCore/Configurations/WebCore.unexp when
+ building with Xcode 5.x.
+ (readXcode5SymbolsToIgnore): Add.
+
</ins><span class="cx"> 2015-02-15 KwangHyuk Kim <hyuki.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] fix Evas GL engine error.
</span></span></pre></div>
<a id="trunkToolsScriptscheckforweakvtablesandexternals"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/check-for-weak-vtables-and-externals (180134 => 180135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/check-for-weak-vtables-and-externals        2015-02-16 03:13:01 UTC (rev 180134)
+++ trunk/Tools/Scripts/check-for-weak-vtables-and-externals        2015-02-16 04:13:21 UTC (rev 180135)
</span><span class="lines">@@ -1,30 +1,26 @@
</span><span class="cx"> #!/usr/bin/perl
</span><span class="cx">
</span><del>-# Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2006-2008, 2010, 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="cx"> # are met:
</span><del>-#
</del><span class="cx"> # 1. Redistributions of source code must retain the above copyright
</span><del>-# notice, this list of conditions and the following disclaimer.
</del><ins>+# notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> # 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer in the
</span><del>-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
</del><ins>+# documentation and/or other materials provided with the distribution.
</ins><span class="cx"> #
</span><del>-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</del><ins>+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
</ins><span class="cx"> # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="cx"> # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
</span><del>-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
</del><ins>+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
</ins><span class="cx"> # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
</span><span class="cx"> # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
</span><del>-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx">
</span><span class="cx"> # "check-for-weak-vtables-and-externals" script for WebKit Open Source Project
</span><span class="cx">
</span><span class="lines">@@ -35,7 +31,12 @@
</span><span class="cx"> use strict;
</span><span class="cx">
</span><span class="cx"> use File::Basename;
</span><ins>+use File::Spec;
+use FindBin;
+use lib $FindBin::Bin;
+use webkitdirs;
</ins><span class="cx">
</span><ins>+sub readXcode5SymbolsToIgnore();
</ins><span class="cx"> sub touch($);
</span><span class="cx">
</span><span class="cx"> my $arch = $ENV{'CURRENT_ARCH'};
</span><span class="lines">@@ -64,6 +65,8 @@
</span><span class="cx"> }
</span><span class="cx"> my @weakVTableClasses = ();
</span><span class="cx"> my @weakExternalSymbols = ();
</span><ins>+ my $isXcode5 = $ENV{'XCODE_VERSION_MAJOR'} eq "0500";
+ my $ignoreXcode5SymbolsRegex = $isXcode5 ? "(" . join("|", grep(quotemeta($_), readXcode5SymbolsToIgnore())) . ")" : undef;
</ins><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">@@ -72,6 +75,9 @@
</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><ins>+ # Symbols that need to be ignored when building with Xcode 5.x.
+ next if $isXcode5 && /\b${ignoreXcode5SymbolsRegex}\b/;
+
</ins><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">@@ -115,6 +121,24 @@
</span><span class="cx">
</span><span class="cx"> exit 0;
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> sub touch($)
</span><span class="cx"> {
</span><span class="cx"> my ($path) = @_;
</span></span></pre>
</div>
</div>
</body>
</html>