<!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>[178293] 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/178293">178293</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-12 13:07:59 -0800 (Mon, 12 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make delegates conform to formal delegate protocols
https://bugs.webkit.org/show_bug.cgi?id=140370

Reviewed by Dan Bernstein.

Source/WebKit/mac:

* DefaultDelegates/WebDefaultPolicyDelegate.h:
* WebCoreSupport/WebInspectorClient.mm:
Add protocols to the interface declarations.

* WebView/WebActionMenuController.mm:
(-[WebActionMenuController prepareForMenu:withEvent:]):
(-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController _updateImmediateActionItem]):
(-[WebImmediateActionController _menuItemForDataDetectedText]):
Cast to id when trying to invoke delegate methods that aren't on WebUIDelegate.

Tools:

* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::numberOfPendingGeolocationPermissionRequests):
(TestRunner::setGeolocationPermission):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDefaultDelegatesWebDefaultPolicyDelegateh">trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllermm">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacFrameLoadDelegateh">trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacPolicyDelegateh">trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacResourceLoadDelegateh">trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacUIDelegateh">trunk/Tools/DumpRenderTree/mac/UIDelegate.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2FindMatchesmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacBackForwardListmm">trunk/Tools/TestWebKitAPI/Tests/mac/BackForwardList.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacCancelLoadFromResourceLoadDelegatemm">trunk/Tools/TestWebKitAPI/Tests/mac/CancelLoadFromResourceLoadDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacCloseNewWindowInNavigationPolicyDelegatemm">trunk/Tools/TestWebKitAPI/Tests/mac/CloseNewWindowInNavigationPolicyDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacContextMenuCanCopyURLmm">trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacDOMHTMLTableCellCellAbovemm">trunk/Tools/TestWebKitAPI/Tests/mac/DOMHTMLTableCellCellAbove.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacDOMRangeOfStringmm">trunk/Tools/TestWebKitAPI/Tests/mac/DOMRangeOfString.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacDeviceScaleFactorInDashboardRegionsmm">trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacElementAtPointInWebFramemm">trunk/Tools/TestWebKitAPI/Tests/mac/ElementAtPointInWebFrame.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacFragmentNavigationmm">trunk/Tools/TestWebKitAPI/Tests/mac/FragmentNavigation.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacHTMLCollectionNamedItemmm">trunk/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacHTMLFormCollectionNamedItemmm">trunk/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacInspectorBarmm">trunk/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacJSWrapperForNodeInWebFramemm">trunk/Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacMemoryCacheDisableWithinResourceLoadDelegatemm">trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCacheDisableWithinResourceLoadDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacMemoryCachePruneWithinResourceLoadDelegatemm">trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCachePruneWithinResourceLoadDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacPageVisibilityStateWithWindowChangesmm">trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacRenderedImageFromDOMNodemm">trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacRenderedImageFromDOMRangemm">trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMRange.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacSetDocumentURImm">trunk/Tools/TestWebKitAPI/Tests/mac/SetDocumentURI.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacSimplifyMarkupmm">trunk/Tools/TestWebKitAPI/Tests/mac/SimplifyMarkup.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacStopLoadingFromDidFinishLoadingmm">trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidFinishLoading.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacStopLoadingFromDidReceiveResponsemm">trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacWebViewDidCreateJavaScriptContextmm">trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacWebViewDidRemoveFrameFromHierarchymm">trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidRemoveFrameFromHierarchy.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacWillPerformClientRedirectToURLCrashmm">trunk/Tools/TestWebKitAPI/Tests/mac/WillPerformClientRedirectToURLCrash.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacWindowlessWebViewWithMediamm">trunk/Tools/TestWebKitAPI/Tests/mac/WindowlessWebViewWithMedia.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacWebKitAgnosticTestmm">trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-12  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Make delegates conform to formal delegate protocols
+        https://bugs.webkit.org/show_bug.cgi?id=140370
+
+        Reviewed by Dan Bernstein.
+
+        * DefaultDelegates/WebDefaultPolicyDelegate.h:
+        * WebCoreSupport/WebInspectorClient.mm:
+        Add protocols to the interface declarations.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController prepareForMenu:withEvent:]):
+        (-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
+        * WebView/WebImmediateActionController.mm:
+        (-[WebImmediateActionController _updateImmediateActionItem]):
+        (-[WebImmediateActionController _menuItemForDataDetectedText]):
+        Cast to id when trying to invoke delegate methods that aren't on WebUIDelegate.
+
</ins><span class="cx"> 2015-01-12  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Allow targetting the SVG-&gt;OTF font converter with ENABLE(SVG_OTF_CONVERTER)
</span></span></pre></div>
<a id="trunkSourceWebKitmacDefaultDelegatesWebDefaultPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.h (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.h        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.h        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -27,13 +27,14 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><ins>+#import &lt;WebKitLegacy/WebPolicyDelegate.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> /*!
</span><span class="cx">     @class WebDefaultPolicyDelegate
</span><span class="cx">     @discussion WebDefaultPolicyDelegate will be used as a WebView's
</span><span class="cx">     default policy delegate.  It can be subclassed to modify policies. 
</span><span class="cx"> */
</span><del>-@interface WebDefaultPolicyDelegate : NSObject
</del><ins>+@interface WebDefaultPolicyDelegate : NSObject &lt;WebPolicyDelegate&gt;
</ins><span class="cx"> + (WebDefaultPolicyDelegate *)sharedPolicyDelegate;
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-@interface WebInspectorWindowController : NSWindowController &lt;NSWindowDelegate&gt; {
</del><ins>+@interface WebInspectorWindowController : NSWindowController &lt;NSWindowDelegate, WebPolicyDelegate, WebUIDelegate&gt; {
</ins><span class="cx"> @private
</span><span class="cx">     RetainPtr&lt;WebView&gt; _inspectedWebView;
</span><span class="cx">     RetainPtr&lt;NSButton&gt; _dockButton;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Allow clients to customize the menu items.
</span><span class="cx">     if ([[_webView UIDelegate] respondsToSelector:@selector(_webView:actionMenuItemsForHitTestResult:withType:defaultActionMenuItems:)])
</span><del>-        menuItems = [[_webView UIDelegate] _webView:_webView actionMenuItemsForHitTestResult:hitTestResult withType:_type defaultActionMenuItems:menuItems];
</del><ins>+        menuItems = [(id)[_webView UIDelegate] _webView:_webView actionMenuItemsForHitTestResult:hitTestResult withType:_type defaultActionMenuItems:menuItems];
</ins><span class="cx"> 
</span><span class="cx">     for (NSMenuItem *item in menuItems)
</span><span class="cx">         [actionMenu addItem:item];
</span><span class="lines">@@ -532,7 +532,7 @@
</span><span class="cx">         RetainPtr&lt;WebElementDictionary&gt; hitTestDictionary = adoptNS([[WebElementDictionary alloc] initWithHitTestResult:_hitTestResult]);
</span><span class="cx"> 
</span><span class="cx">         DOMRange *customDataDetectorsRange;
</span><del>-        actionContext = [[_webView UIDelegate] _webView:_webView actionContextForHitTestResult:hitTestDictionary.get() range:&amp;customDataDetectorsRange];
</del><ins>+        actionContext = [(id)[_webView UIDelegate] _webView:_webView actionContextForHitTestResult:hitTestDictionary.get() range:&amp;customDataDetectorsRange];
</ins><span class="cx"> 
</span><span class="cx">         if (actionContext &amp;&amp; customDataDetectorsRange)
</span><span class="cx">             detectedDataRange = core(customDataDetectorsRange);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">     id customClientAnimationController = nil;
</span><span class="cx">     if ([[_webView UIDelegate] respondsToSelector:@selector(_webView:immediateActionAnimationControllerForHitTestResult:withType:)]) {
</span><span class="cx">         RetainPtr&lt;WebElementDictionary&gt; webHitTestResult = adoptNS([[WebElementDictionary alloc] initWithHitTestResult:_hitTestResult]);
</span><del>-        customClientAnimationController = [[_webView UIDelegate] _webView:_webView immediateActionAnimationControllerForHitTestResult:webHitTestResult.get() withType:_type];
</del><ins>+        customClientAnimationController = [(id)[_webView UIDelegate] _webView:_webView immediateActionAnimationControllerForHitTestResult:webHitTestResult.get() withType:_type];
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (customClientAnimationController == [NSNull null]) {
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">         RetainPtr&lt;WebElementDictionary&gt; hitTestDictionary = adoptNS([[WebElementDictionary alloc] initWithHitTestResult:_hitTestResult]);
</span><span class="cx"> 
</span><span class="cx">         DOMRange *customDataDetectorsRange;
</span><del>-        actionContext = [[_webView UIDelegate] _webView:_webView actionContextForHitTestResult:hitTestDictionary.get() range:&amp;customDataDetectorsRange];
</del><ins>+        actionContext = [(id)[_webView UIDelegate] _webView:_webView actionContextForHitTestResult:hitTestDictionary.get() range:&amp;customDataDetectorsRange];
</ins><span class="cx"> 
</span><span class="cx">         if (actionContext &amp;&amp; customDataDetectorsRange)
</span><span class="cx">             detectedDataRange = core(customDataDetectorsRange);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/ChangeLog        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-12  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Make delegates conform to formal delegate protocols
+        https://bugs.webkit.org/show_bug.cgi?id=140370
+
+        Reviewed by Dan Bernstein.
+
+        * DumpRenderTree/mac/TestRunnerMac.mm:
+        (TestRunner::numberOfPendingGeolocationPermissionRequests):
+        (TestRunner::setGeolocationPermission):
+
</ins><span class="cx"> 2015-01-10  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         build-webkit: silence output of 'which'
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacFrameLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.h (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.h        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.h        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -27,11 +27,12 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><ins>+#import &lt;WebKit/WebFrameLoadDelegate.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> class AccessibilityController;
</span><span class="cx"> class GCController;
</span><span class="cx"> 
</span><del>-@interface FrameLoadDelegate : NSObject
</del><ins>+@interface FrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> {
</span><span class="cx">     AccessibilityController* accessibilityController;
</span><span class="cx">     GCController* gcController;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -27,10 +27,11 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><ins>+#import &lt;WebKit/WebPolicyDelegate.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> class TestRunner;
</span><span class="cx"> 
</span><del>-@interface PolicyDelegate : NSObject {
</del><ins>+@interface PolicyDelegate : NSObject &lt;WebPolicyDelegate&gt; {
</ins><span class="cx">     BOOL permissiveDelegate;
</span><span class="cx">     TestRunner* controllerToNotifyDone;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacResourceLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -27,8 +27,9 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><ins>+#import &lt;WebKit/WebResourceLoadDelegate.h&gt;
</ins><span class="cx"> 
</span><del>-@interface ResourceLoadDelegate : NSObject {
</del><ins>+@interface ResourceLoadDelegate : NSObject &lt;WebResourceLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> #import &lt;WebKit/WebDeviceOrientation.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebDeviceOrientationProviderMock.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebFrame.h&gt;
</span><ins>+#import &lt;WebKit/WebFrameLoadDelegate.h&gt;
</ins><span class="cx"> #import &lt;WebKit/WebFrameViewPrivate.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebGeolocationPosition.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebHTMLRepresentation.h&gt;
</span><span class="lines">@@ -250,7 +251,7 @@
</span><span class="cx"> 
</span><span class="cx"> int TestRunner::numberOfPendingGeolocationPermissionRequests()
</span><span class="cx"> {
</span><del>-    return [[[mainFrame webView] UIDelegate] numberOfPendingGeolocationPermissionRequests];
</del><ins>+    return [(UIDelegate *)[[mainFrame webView] UIDelegate] numberOfPendingGeolocationPermissionRequests];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> size_t TestRunner::webHistoryItemCount()
</span><span class="lines">@@ -434,7 +435,7 @@
</span><span class="cx"> void TestRunner::setGeolocationPermission(bool allow)
</span><span class="cx"> {
</span><span class="cx">     setGeolocationPermissionCommon(allow);
</span><del>-    [[[mainFrame webView] UIDelegate] didSetMockGeolocationPermission];
</del><ins>+    [(UIDelegate *)[[mainFrame webView] UIDelegate] didSetMockGeolocationPermission];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void TestRunner::setIconDatabaseEnabled(bool iconDatabaseEnabled)
</span><span class="lines">@@ -823,7 +824,7 @@
</span><span class="cx">     [mainFrame _stringByEvaluatingJavaScriptFromString:scriptNS withGlobalObject:globalObject inScriptWorld:world];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-@interface APITestDelegate : NSObject
</del><ins>+@interface APITestDelegate : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> {
</span><span class="cx">     bool* m_condition;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/UIDelegate.h (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/UIDelegate.h        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/DumpRenderTree/mac/UIDelegate.h        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -32,7 +32,9 @@
</span><span class="cx"> #import &lt;WebKit/WAKView.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-@interface UIDelegate : NSObject {
</del><ins>+#import &lt;WebKit/WebUIDelegate.h&gt;
+
+@interface UIDelegate : NSObject &lt;WebUIDelegate&gt; {
</ins><span class="cx"> @private
</span><span class="cx">     NSPoint windowOrigin;
</span><span class="cx">     NSMutableSet *m_pendingGeolocationPermissionListeners;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import &lt;WebKit/WebPreferenceKeysPrivate.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebViewPrivate.h&gt;
</span><span class="cx"> 
</span><del>-@interface WK1BrowserWindowController ()
</del><ins>+@interface WK1BrowserWindowController () &lt;WebFrameLoadDelegate, WebPolicyDelegate, WebResourceLoadDelegate, WebUIDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation WK1BrowserWindowController
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2FindMatchesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include &lt;WebKit/WKImage.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface FindMatchesWK1FrameLoadDelegate : NSObject {
</del><ins>+@interface FindMatchesWK1FrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/BackForwardList.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/BackForwardList.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/BackForwardList.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &lt;WebKit/WebBackForwardList.h&gt;
</span><span class="cx"> 
</span><del>-@interface BackForwardListTest : NSObject {
</del><ins>+@interface BackForwardListTest : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacCancelLoadFromResourceLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/CancelLoadFromResourceLoadDelegate.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/CancelLoadFromResourceLoadDelegate.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/CancelLoadFromResourceLoadDelegate.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #import &quot;PlatformUtilities.h&quot;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface CancelLoadFromResourceLoadDelegate : NSObject {
</del><ins>+@interface CancelLoadFromResourceLoadDelegate : NSObject &lt;WebResourceLoadDelegate&gt; {
</ins><span class="cx">     size_t resourceCount;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad = false;
</span><span class="cx"> 
</span><del>-@interface CancelLoadFromResourceLoadDelegateFrameLoadDelegate : NSObject
</del><ins>+@interface CancelLoadFromResourceLoadDelegateFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation CancelLoadFromResourceLoadDelegateFrameLoadDelegate
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacCloseNewWindowInNavigationPolicyDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/CloseNewWindowInNavigationPolicyDelegate.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/CloseNewWindowInNavigationPolicyDelegate.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/CloseNewWindowInNavigationPolicyDelegate.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool testFinished = false;
</span><span class="cx"> 
</span><del>-@interface TestDelegate : NSObject
</del><ins>+@interface TestDelegate : NSObject &lt;WebPolicyDelegate, WebUIDelegate&gt;
</ins><span class="cx"> 
</span><span class="cx"> + (TestDelegate *)shared;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacContextMenuCanCopyURLmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-@interface ContextMenuCanCopyURLDelegate : NSObject {
</del><ins>+@interface ContextMenuCanCopyURLDelegate : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacDOMHTMLTableCellCellAbovemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/DOMHTMLTableCellCellAbove.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/DOMHTMLTableCellCellAbove.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/DOMHTMLTableCellCellAbove.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #import &lt;WebKit/DOMPrivate.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebViewPrivate.h&gt;
</span><span class="cx"> 
</span><del>-@interface HTMLTableCellElementCellAboveTest : NSObject
</del><ins>+@interface HTMLTableCellElementCellAboveTest : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacDOMRangeOfStringmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/DOMRangeOfString.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/DOMRangeOfString.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/DOMRangeOfString.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #import &lt;WebKit/DOM.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface DOMRangeOfStringFrameLoadDelegate : NSObject {
</del><ins>+@interface DOMRangeOfStringFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacDeviceScaleFactorInDashboardRegionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> static bool gotDashboardRegions;
</span><span class="cx"> static NSDictionary *regions;
</span><span class="cx"> 
</span><del>-@interface DeviceScaleFactorInDashboardRegionsUIDelegate : NSObject {
</del><ins>+@interface DeviceScaleFactorInDashboardRegionsUIDelegate : NSObject &lt;WebUIDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacElementAtPointInWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/ElementAtPointInWebFrame.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/ElementAtPointInWebFrame.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/ElementAtPointInWebFrame.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import &lt;WebKit/WebFramePrivate.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface ElementAtPointFrameLoadDelegate : NSObject
</del><ins>+@interface ElementAtPointFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacFragmentNavigationmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/FragmentNavigation.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/FragmentNavigation.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/FragmentNavigation.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool testFinished;
</span><span class="cx"> 
</span><del>-@interface WebKit1FragmentNavigationTestDelegate : NSObject {
</del><ins>+@interface WebKit1FragmentNavigationTestDelegate : NSObject &lt;WebFrameLoadDelegate, WebPolicyDelegate, WebUIDelegate&gt; {
</ins><span class="cx">     unsigned _stage;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacHTMLCollectionNamedItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #import &lt;WebKit/DOM.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebViewPrivate.h&gt;
</span><span class="cx"> 
</span><del>-@interface HTMLCollectionNamedItemTest : NSObject {
</del><ins>+@interface HTMLCollectionNamedItemTest : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacHTMLFormCollectionNamedItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #import &lt;WebKit/DOM.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebViewPrivate.h&gt;
</span><span class="cx"> 
</span><del>-@interface HTMLFormCollectionNamedItemTest : NSObject {
</del><ins>+@interface HTMLFormCollectionNamedItemTest : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacInspectorBarmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #import &quot;PlatformUtilities.h&quot;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface InspectorBarController : NSObject {
</del><ins>+@interface InspectorBarController : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacJSWrapperForNodeInWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import &lt;JavaScriptCore/JSValueRef.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface JSWrapperForNodeFrameLoadDelegate : NSObject {
</del><ins>+@interface JSWrapperForNodeFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacMemoryCacheDisableWithinResourceLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCacheDisableWithinResourceLoadDelegate.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCacheDisableWithinResourceLoadDelegate.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCacheDisableWithinResourceLoadDelegate.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import &lt;WebKit/WebCache.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface MemoryCacheDisableTestResourceLoadDelegate : NSObject {
</del><ins>+@interface MemoryCacheDisableTestResourceLoadDelegate : NSObject &lt;WebResourceLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacMemoryCachePruneWithinResourceLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCachePruneWithinResourceLoadDelegate.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCachePruneWithinResourceLoadDelegate.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCachePruneWithinResourceLoadDelegate.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #import &quot;PlatformUtilities.h&quot;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface MemoryCachePruneTestResourceLoadDelegate : NSObject {
</del><ins>+@interface MemoryCachePruneTestResourceLoadDelegate : NSObject &lt;WebResourceLoadDelegate&gt; {
</ins><span class="cx"> @public
</span><span class="cx">     NSWindow *_window;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacPageVisibilityStateWithWindowChangesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx"> // WebKit1 WebUIDelegate
</span><span class="cx"> 
</span><del>-@interface PageVisibilityStateDelegate : NSObject
</del><ins>+@interface PageVisibilityStateDelegate : NSObject &lt;WebUIDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation PageVisibilityStateDelegate
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacRenderedImageFromDOMNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #import &lt;WebKit/DOMPrivate.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface RenderedImageFromDOMNodeFrameLoadDelegate : NSObject {
</del><ins>+@interface RenderedImageFromDOMNodeFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacRenderedImageFromDOMRangemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMRange.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMRange.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMRange.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #import &lt;WebKit/DOMPrivate.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface RenderedImageFromDOMRangeFrameLoadDelegate : NSObject {
</del><ins>+@interface RenderedImageFromDOMRangeFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacSetDocumentURImm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/SetDocumentURI.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/SetDocumentURI.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/SetDocumentURI.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #import &lt;WebKit/DOM.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebViewPrivate.h&gt;
</span><span class="cx"> 
</span><del>-@interface SetDocumentURITest : NSObject {
</del><ins>+@interface SetDocumentURITest : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacSimplifyMarkupmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/SimplifyMarkup.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/SimplifyMarkup.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/SimplifyMarkup.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #import &lt;WebKit/DOM.h&gt;
</span><span class="cx"> #import &lt;WebKit/WebViewPrivate.h&gt;
</span><span class="cx"> 
</span><del>-@interface SimplifyMarkupTest : NSObject {
</del><ins>+@interface SimplifyMarkupTest : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacStopLoadingFromDidFinishLoadingmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidFinishLoading.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidFinishLoading.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidFinishLoading.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import &lt;wtf/AutodrainedPool.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface StopLoadingFromDidFinishLoadingDelegate : NSObject {
</del><ins>+@interface StopLoadingFromDidFinishLoadingDelegate : NSObject &lt;WebResourceLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacStopLoadingFromDidReceiveResponsemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import &lt;WebKit/WebCache.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface StopLoadingFromDidReceiveResponse : NSObject {
</del><ins>+@interface StopLoadingFromDidReceiveResponse : NSObject &lt;WebResourceLoadDelegate&gt; {
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacWebViewDidCreateJavaScriptContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-@interface DidCreateJavaScriptContextFrameLoadDelegate : NSObject
</del><ins>+@interface DidCreateJavaScriptContextFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation DidCreateJavaScriptContextFrameLoadDelegate
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacWebViewDidRemoveFrameFromHierarchymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidRemoveFrameFromHierarchy.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidRemoveFrameFromHierarchy.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidRemoveFrameFromHierarchy.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import &lt;WebKit/WebFrameLoadDelegatePrivate.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface DidRemoveFrameFromHierarchyFrameLoadDelegate : NSObject
</del><ins>+@interface DidRemoveFrameFromHierarchyFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacWillPerformClientRedirectToURLCrashmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/WillPerformClientRedirectToURLCrash.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/WillPerformClientRedirectToURLCrash.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/WillPerformClientRedirectToURLCrash.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">     return url.get();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-@interface WebKit1TestDelegate : NSObject
</del><ins>+@interface WebKit1TestDelegate : NSObject &lt;WebFrameLoadDelegate, WebUIDelegate&gt;
</ins><span class="cx"> 
</span><span class="cx"> + (WebKit1TestDelegate *)shared;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacWindowlessWebViewWithMediamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/WindowlessWebViewWithMedia.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/WindowlessWebViewWithMedia.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/WindowlessWebViewWithMedia.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-@interface WindowlessWebViewWithMediaFrameLoadDelegate : NSObject
</del><ins>+@interface WindowlessWebViewWithMediaFrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation WindowlessWebViewWithMediaFrameLoadDelegate
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacWebKitAgnosticTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm (178292 => 178293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm        2015-01-12 20:55:09 UTC (rev 178292)
+++ trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm        2015-01-12 21:07:59 UTC (rev 178293)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include &lt;WebKit/WKViewPrivate.h&gt;
</span><span class="cx"> #include &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><del>-@interface FrameLoadDelegate : NSObject {
</del><ins>+@interface FrameLoadDelegate : NSObject &lt;WebFrameLoadDelegate&gt; {
</ins><span class="cx">     bool* _didFinishLoad;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>