<!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>[178660] 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/178660">178660</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-01-19 11:45:24 -0800 (Mon, 19 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add &quot;override&quot; to fix the build with newer clangs.

Source/WebKit2:

* UIProcess/Cocoa/WebProcessProxyCocoa.mm:
(WebKit::WebProcessProxy::transformHandlesToObjects):
(WebKit::WebProcessProxy::transformObjectsToHandles):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::transformObjectsToHandles):
* UIProcess/ios/WebVideoFullscreenManagerProxy.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::transformHandlesToObjects):
(WebKit::WebProcess::transformObjectsToHandles):

Tools:

* TestWebKitAPI/Tests/WebCore/CalculationValue.cpp:
(TestWebKitAPI::CalculationDeletionTestNode::operator==):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxyh">trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreCalculationValuecpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178659 => 178660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/ChangeLog        2015-01-19 19:45:24 UTC (rev 178660)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-19  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Add &quot;override&quot; to fix the build with newer clangs.
+
+        * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+        (WebKit::WebProcessProxy::transformHandlesToObjects):
+        (WebKit::WebProcessProxy::transformObjectsToHandles):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::transformObjectsToHandles):
+        * UIProcess/ios/WebVideoFullscreenManagerProxy.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::transformHandlesToObjects):
+        (WebKit::WebProcess::transformObjectsToHandles):
+
</ins><span class="cx"> 2015-01-19  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [SVG -&gt; OTF Converter] Flip the switch on
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm (178659 => 178660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm        2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm        2015-01-19 19:45:24 UTC (rev 178660)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">             return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        virtual RetainPtr&lt;id&gt; transformObject(id object) const
</del><ins>+        virtual RetainPtr&lt;id&gt; transformObject(id object) const override
</ins><span class="cx">         {
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">             if (auto* handle = dynamic_objc_cast&lt;WKBrowsingContextHandle&gt;(object)) {
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">             return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        virtual RetainPtr&lt;id&gt; transformObject(id object) const
</del><ins>+        virtual RetainPtr&lt;id&gt; transformObject(id object) const override
</ins><span class="cx">         {
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">             if (auto* controller = dynamic_objc_cast&lt;WKBrowsingContextController&gt;(object))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (178659 => 178660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2015-01-19 19:45:24 UTC (rev 178660)
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx"> RefPtr&lt;API::Object&gt; WebProcessProxy::transformObjectsToHandles(API::Object* object)
</span><span class="cx"> {
</span><span class="cx">     struct Transformer final : UserData::Transformer {
</span><del>-        virtual bool shouldTransformObject(const API::Object&amp; object) const
</del><ins>+        virtual bool shouldTransformObject(const API::Object&amp; object) const override
</ins><span class="cx">         {
</span><span class="cx">             switch (object.type()) {
</span><span class="cx">             case API::Object::Type::Frame:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h (178659 => 178660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h        2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h        2015-01-19 19:45:24 UTC (rev 178660)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">     void setupFullscreenWithID(uint32_t, WebCore::IntRect initialRect, float hostingDeviceScaleFactor, WebCore::HTMLMediaElement::VideoFullscreenMode, bool allowOptimizedFullscreen);
</span><span class="cx">     void setSeekableRangesVector(const Vector&lt;std::pair&lt;double, double&gt;&gt;&amp;);
</span><span class="cx">     void setExternalPlaybackProperties(bool enabled, uint32_t targetType, String localizedDeviceName);
</span><del>-    void fullscreenModeChanged(WebCore::HTMLMediaElement::VideoFullscreenMode);
</del><ins>+    void fullscreenModeChanged(WebCore::HTMLMediaElement::VideoFullscreenMode) override;
</ins><span class="cx">     
</span><span class="cx">     // Fullscreen Observer
</span><span class="cx">     virtual void didSetupFullscreen() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (178659 => 178660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm        2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm        2015-01-19 19:45:24 UTC (rev 178660)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">             return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        virtual RetainPtr&lt;id&gt; transformObject(id object) const
</del><ins>+        virtual RetainPtr&lt;id&gt; transformObject(id object) const override
</ins><span class="cx">         {
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">             if (auto* handle = dynamic_objc_cast&lt;WKBrowsingContextHandle&gt;(object)) {
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx">             return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        virtual RetainPtr&lt;id&gt; transformObject(id object) const
</del><ins>+        virtual RetainPtr&lt;id&gt; transformObject(id object) const override
</ins><span class="cx">         {
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">             if (auto* controller = dynamic_objc_cast&lt;WKWebProcessPlugInBrowserContextController&gt;(object))
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178659 => 178660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Tools/ChangeLog        2015-01-19 19:45:24 UTC (rev 178660)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2015-01-19  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Add &quot;override&quot; to fix the build with newer clangs.
+
+        * TestWebKitAPI/Tests/WebCore/CalculationValue.cpp:
+        (TestWebKitAPI::CalculationDeletionTestNode::operator==):
+
</ins><span class="cx"> 2015-01-19  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp (178659 => 178660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp        2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp        2015-01-19 19:45:24 UTC (rev 178660)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     virtual float evaluate(float) const override { return 0; }
</span><del>-    bool operator==(const CalcExpressionNode&amp;) const { ASSERT_NOT_REACHED(); return false; }
</del><ins>+    bool operator==(const CalcExpressionNode&amp;) const override { ASSERT_NOT_REACHED(); return false; }
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> static Ref&lt;WebCore::CalculationValue&gt; createTestValue()
</span></span></pre>
</div>
</div>

</body>
</html>