<!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>[183090] trunk/Source/WebKit2</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/183090">183090</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-21 18:17:08 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add module maps for WebKit
https://bugs.webkit.org/show_bug.cgi?id=144026
rdar://problem/19665428
Reviewed by Dan Bernstein.
* Configurations/WebKit.xcconfig:
* Modules/OSX.modulemap: Added.
* Modules/iOS.modulemap: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKitxcconfig">trunk/Source/WebKit2/Configurations/WebKit.xcconfig</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Modules/</li>
<li><a href="#trunkSourceWebKit2ModulesOSXmodulemap">trunk/Source/WebKit2/Modules/OSX.modulemap</a></li>
<li><a href="#trunkSourceWebKit2ModulesiOSmodulemap">trunk/Source/WebKit2/Modules/iOS.modulemap</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183089 => 183090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-22 00:51:07 UTC (rev 183089)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-22 01:17:08 UTC (rev 183090)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-21 Anders Carlsson <andersca@apple.com>
+
+ Add module maps for WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=144026
+ rdar://problem/19665428
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/WebKit.xcconfig:
+ * Modules/OSX.modulemap: Added.
+ * Modules/iOS.modulemap: Added.
+
</ins><span class="cx"> 2015-04-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Long pause under _takeViewSnapshot when screen updates are disabled
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (183089 => 183090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-04-22 00:51:07 UTC (rev 183089)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-04-22 01:17:08 UTC (rev 183090)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx"> PRODUCT_NAME = WebKit;
</span><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><span class="cx">
</span><ins>+DEFINES_MODULE=YES;
+MODULEMAP_FILE[sdk=macosx*]=Modules/OSX.modulemap;
+MODULEMAP_FILE[sdk=iphone*]=Modules/iOS.modulemap;
+
</ins><span class="cx"> INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR);
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ModulesOSXmodulemap"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Modules/OSX.modulemap (0 => 183090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Modules/OSX.modulemap (rev 0)
+++ trunk/Source/WebKit2/Modules/OSX.modulemap 2015-04-22 01:17:08 UTC (rev 183090)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+framework module WebKit [system] [extern_c] {
+ umbrella header "WebKit.h"
+ module * { export * }
+ export *
+
+ explicit module NPAPI {
+ header "nptypes.h"
+ header "npapi.h"
+ header "npfunctions.h"
+ header "npruntime.h"
+ export *
+ }
+
+ explicit module DOMProgressEvent {
+ header "DOMProgressEvent.h"
+ export *
+ }
+
+ exclude header "HIWebView.h"
+ exclude header "CarbonUtils.h"
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2ModulesiOSmodulemap"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Modules/iOS.modulemap (0 => 183090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Modules/iOS.modulemap (rev 0)
+++ trunk/Source/WebKit2/Modules/iOS.modulemap 2015-04-22 01:17:08 UTC (rev 183090)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+framework module WebKit [system] [extern_c] {
+ umbrella header "WebKit.h"
+ module * { export * }
+ export *
+}
</ins></span></pre>
</div>
</div>
</body>
</html>