<!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>[175287] branches/safari-600.3-branch/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/175287">175287</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 17:13:17 -0700 (Tue, 28 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174368">r174368</a>. &lt;rdar://problem/18753175&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKitChangeLog">branches/safari-600.3-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">branches/safari-600.3-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/ChangeLog (175286 => 175287)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/ChangeLog        2014-10-28 23:54:50 UTC (rev 175286)
+++ branches/safari-600.3-branch/Source/WebKit/ChangeLog        2014-10-29 00:13:17 UTC (rev 175287)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-10-28  Dana Burkart  &lt;dburkart@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r174368. &lt;rdar://problem/18753175&gt;
+
+    2014-10-06  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+    
+            [Win] Unreviewed 64-bit build fix after r174315.
+    
+            * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Update exports for
+            64-bit symbol names.
+    
+2014-10-28  Dana Burkart  &lt;dburkart@apple.com&gt;
+
</ins><span class="cx">         Merge r174321. &lt;rdar://problem/18753175&gt;
</span><span class="cx"> 
</span><span class="cx">     2014-10-04  Timothy Horton  &lt;timothy_horton@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (175286 => 175287)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in        2014-10-28 23:54:50 UTC (rev 175286)
+++ branches/safari-600.3-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in        2014-10-29 00:13:17 UTC (rev 175287)
</span><span class="lines">@@ -490,23 +490,23 @@
</span><span class="cx">         symbolWithPointer(?throwSetterTypeError@WebCore@@YAXAAVExecState@JSC@@PBD1@Z, ?throwSetterTypeError@WebCore@@YAXAEAVExecState@JSC@@PEBD1@Z)
</span><span class="cx">         symbolWithPointer(?throwThisTypeError@WebCore@@YA_JAAVExecState@JSC@@PBD1@Z, ?throwThisTypeError@WebCore@@YA_JAEAVExecState@JSC@@PEBD1@Z)
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><del>-        symbolWithPointer(?registerCDMFactory@CDM@WebCore@@SAXP6A?AV?$unique_ptr@VCDMPrivateInterface@WebCore@@U?$default_delete@VCDMPrivateInterface@WebCore@@@std@@@std@@PAV12@@ZP6A_NABVString@WTF@@@ZP6A_N22@Z@Z,)
</del><ins>+        symbolWithPointer(?registerCDMFactory@CDM@WebCore@@SAXP6A?AV?$unique_ptr@VCDMPrivateInterface@WebCore@@U?$default_delete@VCDMPrivateInterface@WebCore@@@std@@@std@@PAV12@@ZP6A_NABVString@WTF@@@ZP6A_N22@Z@Z,?registerCDMFactory@CDM@WebCore@@SAXP6A?AV?$unique_ptr@VCDMPrivateInterface@WebCore@@U?$default_delete@VCDMPrivateInterface@WebCore@@@std@@@std@@PEAV12@@ZP6A_NAEBVString@WTF@@@ZP6A_N22@Z@Z)
</ins><span class="cx"> #endif
</span><del>-        ?updateLayout@Document@WebCore@@QAEXXZ
-        ?throwArgumentMustBeEnumError@WebCore@@YA_JAAVExecState@JSC@@IPBD111@Z
-        ?makeRGB@WebCore@@YAIHHH@Z
-        ?create@PageOverlay@WebCore@@SA?AV?$PassRefPtr@VPageOverlay@WebCore@@@WTF@@AAVClient@12@W4OverlayType@12@@Z
-        ??1PageOverlay@WebCore@@UAE@XZ
-        ?controller@PageOverlay@WebCore@@QBEPAVPageOverlayController@2@XZ
-        ?setNeedsDisplay@PageOverlay@WebCore@@QAEXXZ
-        ?bounds@PageOverlay@WebCore@@QBE?AVIntRect@2@XZ
-        ??0FloatRect@WebCore@@QAE@ABVIntRect@1@@Z
-        ?setStrokeColor@GraphicsContext@WebCore@@QAEXABVColor@2@W4ColorSpace@2@@Z
-        ?save@GraphicsContext@WebCore@@QAEXXZ
-        ?restore@GraphicsContext@WebCore@@QAEXXZ
-        ?strokeRect@GraphicsContext@WebCore@@QAEXABVFloatRect@2@M@Z
-        ?layerTreeAsText@GraphicsLayer@WebCore@@QBE?AVString@WTF@@I@Z
-        ?documentOverlayRootLayer@PageOverlayController@WebCore@@QAEAAVGraphicsLayer@2@XZ
-        ?viewOverlayRootLayer@PageOverlayController@WebCore@@QAEAAVGraphicsLayer@2@XZ
-        ?installPageOverlay@PageOverlayController@WebCore@@QAEXV?$PassRefPtr@VPageOverlay@WebCore@@@WTF@@W4FadeMode@PageOverlay@2@@Z
-        ?uninstallPageOverlay@PageOverlayController@WebCore@@QAEXPAVPageOverlay@2@W4FadeMode@32@@Z
</del><ins>+        symbolWithPointer(?updateLayout@Document@WebCore@@QAEXXZ, ?updateLayout@Document@WebCore@@QEAAXXZ)
+        symbolWithPointer(?throwArgumentMustBeEnumError@WebCore@@YA_JAAVExecState@JSC@@IPBD111@Z, ?throwArgumentMustBeEnumError@WebCore@@YA_JAEAVExecState@JSC@@IPEBD111@Z)
+        symbolWithPointer(?makeRGB@WebCore@@YAIHHH@Z, ?makeRGB@WebCore@@YAIHHH@Z)
+        symbolWithPointer(?create@PageOverlay@WebCore@@SA?AV?$PassRefPtr@VPageOverlay@WebCore@@@WTF@@AAVClient@12@W4OverlayType@12@@Z, ?create@PageOverlay@WebCore@@SA?AV?$PassRefPtr@VPageOverlay@WebCore@@@WTF@@AEAVClient@12@W4OverlayType@12@@Z)
+        symbolWithPointer(??1PageOverlay@WebCore@@UAE@XZ, ??1PageOverlay@WebCore@@UEAA@XZ)
+        symbolWithPointer(?controller@PageOverlay@WebCore@@QBEPAVPageOverlayController@2@XZ, ?controller@PageOverlay@WebCore@@QEBAPEAVPageOverlayController@2@XZ)
+        symbolWithPointer(?setNeedsDisplay@PageOverlay@WebCore@@QAEXXZ, ?setNeedsDisplay@PageOverlay@WebCore@@QEAAXXZ)
+        symbolWithPointer(?bounds@PageOverlay@WebCore@@QBE?AVIntRect@2@XZ, ?bounds@PageOverlay@WebCore@@QEBA?AVIntRect@2@XZ)
+        symbolWithPointer(??0FloatRect@WebCore@@QAE@ABVIntRect@1@@Z,??0FloatRect@WebCore@@QEAA@AEBVIntRect@1@@Z )
+        symbolWithPointer(?setStrokeColor@GraphicsContext@WebCore@@QAEXABVColor@2@W4ColorSpace@2@@Z, ?setStrokeColor@GraphicsContext@WebCore@@QEAAXAEBVColor@2@W4ColorSpace@2@@Z)
+        symbolWithPointer(?save@GraphicsContext@WebCore@@QAEXXZ, ?save@GraphicsContext@WebCore@@QEAAXXZ)
+        symbolWithPointer(?restore@GraphicsContext@WebCore@@QAEXXZ, ?restore@GraphicsContext@WebCore@@QEAAXXZ)
+        symbolWithPointer(?strokeRect@GraphicsContext@WebCore@@QAEXABVFloatRect@2@M@Z, ?strokeRect@GraphicsContext@WebCore@@QEAAXAEBVFloatRect@2@M@Z)
+        symbolWithPointer(?layerTreeAsText@GraphicsLayer@WebCore@@QBE?AVString@WTF@@I@Z, ?layerTreeAsText@GraphicsLayer@WebCore@@QEBA?AVString@WTF@@I@Z)
+        symbolWithPointer(?documentOverlayRootLayer@PageOverlayController@WebCore@@QAEAAVGraphicsLayer@2@XZ, ?documentOverlayRootLayer@PageOverlayController@WebCore@@QEAAAEAVGraphicsLayer@2@XZ)
+        symbolWithPointer(?viewOverlayRootLayer@PageOverlayController@WebCore@@QAEAAVGraphicsLayer@2@XZ, ?viewOverlayRootLayer@PageOverlayController@WebCore@@QEAAAEAVGraphicsLayer@2@XZ)
+        symbolWithPointer(?installPageOverlay@PageOverlayController@WebCore@@QAEXV?$PassRefPtr@VPageOverlay@WebCore@@@WTF@@W4FadeMode@PageOverlay@2@@Z, ?installPageOverlay@PageOverlayController@WebCore@@QEAAXV?$PassRefPtr@VPageOverlay@WebCore@@@WTF@@W4FadeMode@PageOverlay@2@@Z)
+        symbolWithPointer(?uninstallPageOverlay@PageOverlayController@WebCore@@QAEXPAVPageOverlay@2@W4FadeMode@32@@Z, ?uninstallPageOverlay@PageOverlayController@WebCore@@QEAAXPEAVPageOverlay@2@W4FadeMode@32@@Z)
</ins></span></pre>
</div>
</div>

</body>
</html>