<!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>[162008] trunk/Source/WebKit</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/162008">162008</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-01-14 14:18:16 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK1] Allow generated export files on iOS
https://bugs.webkit.org/show_bug.cgi?id=127008
Reviewed by Simon Fraser.
Source/WebKit:
Modify the export file generation rule to read from
a shared and platform-specific input file.
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
Add a new Mac-only symbol file.
* WebKit.exp: To begin, move the WebIcon* into the Mac-specific exports.
* WebKit.mac.exp: Added. New file holds Mac-only symbols.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebKitexp">trunk/Source/WebKit/mac/WebKit.exp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacWebKitmacexp">trunk/Source/WebKit/mac/WebKit.mac.exp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (162007 => 162008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-01-14 22:13:33 UTC (rev 162007)
+++ trunk/Source/WebKit/ChangeLog 2014-01-14 22:18:16 UTC (rev 162008)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-14 Dean Jackson <dino@apple.com>
+
+ [WK1] Allow generated export files on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=127008
+
+ Reviewed by Simon Fraser.
+
+ Modify the export file generation rule to read from
+ a shared and platform-specific input file.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-01-13 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for Win64.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (162007 => 162008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-14 22:13:33 UTC (rev 162007)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-14 22:18:16 UTC (rev 162008)
</span><span class="lines">@@ -526,6 +526,7 @@
</span><span class="cx"> 312E2FE314E48182007CCA18 /* WebNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotification.h; sourceTree = "<group>"; };
</span><span class="cx"> 312E2FE414E48182007CCA18 /* WebNotification.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNotification.mm; sourceTree = "<group>"; };
</span><span class="cx"> 312E2FE814E48215007CCA18 /* WebNotificationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotificationInternal.h; sourceTree = "<group>"; };
</span><ins>+ 319A3F4D1885E5FB00E0C900 /* WebKit.mac.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; name = WebKit.mac.exp; path = mac/WebKit.mac.exp; sourceTree = "<group>"; };
</ins><span class="cx"> 31C11A6C1476552E0049A4CC /* WebNotificationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 31C11A6D1476552E0049A4CC /* WebNotificationClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNotificationClient.mm; sourceTree = "<group>"; };
</span><span class="cx"> 35081D9202B6D4D80ACA2ACA /* WebHTMLRepresentation.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; indentWidth = 4; path = WebHTMLRepresentation.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="lines">@@ -923,6 +924,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> 1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */,
</span><span class="cx"> F5F732D202FF4D4F01A80180 /* WebKit.exp */,
</span><ins>+ 319A3F4D1885E5FB00E0C900 /* WebKit.mac.exp */,
</ins><span class="cx"> A10C1D8F1820307D0036883A /* WebKit.iOS.exp */,
</span><span class="cx"> F5C283730284676D018635CA /* WebKitPrefix.h */,
</span><span class="cx"> 6508A4A7099B375F00BCBF45 /* Default Delegates */,
</span><span class="lines">@@ -1922,7 +1924,7 @@
</span><span class="cx"> A13EE61D185AE82700556064 /* Postprocess Headers */,
</span><span class="cx"> 939810B20824BF01008DF038 /* Resources */,
</span><span class="cx"> 939810BB0824BF01008DF038 /* Sources */,
</span><del>- 1C395DE20C6BE8E0000D1E52 /* Generate 64-bit Export File */,
</del><ins>+ 1C395DE20C6BE8E0000D1E52 /* Generate Export Files */,
</ins><span class="cx"> 939811270824BF01008DF038 /* Frameworks */,
</span><span class="cx"> 5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */,
</span><span class="cx"> 3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */,
</span><span class="lines">@@ -1988,7 +1990,7 @@
</span><span class="cx"> /* End PBXResourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXShellScriptBuildPhase section */
</span><del>- 1C395DE20C6BE8E0000D1E52 /* Generate 64-bit Export File */ = {
</del><ins>+ 1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
</ins><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="lines">@@ -1996,15 +1998,16 @@
</span><span class="cx"> inputPaths = (
</span><span class="cx"> "$(SRCROOT)/mac/WebKit.exp",
</span><span class="cx"> "$(SRCROOT)/ios/WebKit.IOS.exp",
</span><ins>+ "$(SRCROOT)/mac/WebKit.mac.exp",
</ins><span class="cx"> );
</span><del>- name = "Generate 64-bit Export File";
</del><ins>+ name = "Generate Export Files";
</ins><span class="cx"> outputPaths = (
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp",
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp",
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${PROJECT_DIR}/mac/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n\nif [[ \"${PLATFORM_NAME}\" == \"iphoneos\" || \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]]; then\n cat \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\" \"${PROJECT_DIR}/ios/WebKit.iOS.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nfi;\n";
</del><ins>+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\nif [[ \"${PLATFORM_NAME}\" == \"iphoneos\" || \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]]; then\n cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/ios/WebKit.iOS.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nelse\n cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/mac/WebKit.mac.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nfi;\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
</ins><span class="cx"> };
</span><span class="cx"> 1C6CB0510AA63EB000D23BFD /* Migrate Headers */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (162007 => 162008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-14 22:13:33 UTC (rev 162007)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-14 22:18:16 UTC (rev 162008)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-14 Dean Jackson <dino@apple.com>
+
+ [WK1] Allow generated export files on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=127008
+
+ Reviewed by Simon Fraser.
+
+ Add a new Mac-only symbol file.
+
+ * WebKit.exp: To begin, move the WebIcon* into the Mac-specific exports.
+ * WebKit.mac.exp: Added. New file holds Mac-only symbols.
+
</ins><span class="cx"> 2014-01-14 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Add ENABLE(WEB_REPLAY) feature flag to the build system
</span><span class="lines">@@ -12,7 +24,7 @@
</span><span class="cx"> Fix the Mac build. WebViewPrivate.h declares quickLookContentForURL:
</span><span class="cx"> for iOS, but the implementation conditionalizes on USE(QUICK_LOOK),
</span><span class="cx"> which we are confused about.
</span><del>-
</del><ins>+
</ins><span class="cx"> * WebView/WebView.mm:
</span><span class="cx"> (-[WebView quickLookContentForURL:]):
</span><span class="cx"> * WebView/WebViewPrivate.h:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKit.exp (162007 => 162008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKit.exp 2014-01-14 22:13:33 UTC (rev 162007)
+++ trunk/Source/WebKit/mac/WebKit.exp 2014-01-14 22:18:16 UTC (rev 162008)
</span><span class="lines">@@ -86,13 +86,6 @@
</span><span class="cx"> _WebHistoryItemsRemovedNotification
</span><span class="cx"> _WebHistoryLoadedNotification
</span><span class="cx"> _WebHistorySavedNotification
</span><del>-_WebIconDatabaseDidAddIconNotification
-_WebIconDatabaseDidRemoveAllIconsNotification
-_WebIconDatabaseDirectoryDefaultsKey
-_WebIconLargeSize
-_WebIconMediumSize
-_WebIconNotificationUserInfoURLKey
-_WebIconSmallSize
</del><span class="cx"> _WebInitForCarbon
</span><span class="cx"> _WebInspectorDidStartSearchingForNode
</span><span class="cx"> _WebInspectorDidStopSearchingForNode
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitmacexp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/mac/WebKit.mac.exp (0 => 162008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKit.mac.exp (rev 0)
+++ trunk/Source/WebKit/mac/WebKit.mac.exp 2014-01-14 22:18:16 UTC (rev 162008)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+_WebIconDatabaseDidAddIconNotification
+_WebIconDatabaseDidRemoveAllIconsNotification
+_WebIconDatabaseDirectoryDefaultsKey
+_WebIconLargeSize
+_WebIconMediumSize
+_WebIconNotificationUserInfoURLKey
+_WebIconSmallSize
</ins></span></pre>
</div>
</div>
</body>
</html>