<!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>[177760] 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/177760">177760</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-12-27 10:14:41 -0800 (Sat, 27 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] WKWebProcessPlugInLoadDelegate uses the deprecated WKRenderingProgressEvents enum
https://bugs.webkit.org/show_bug.cgi?id=139964
Reviewed by Anders Carlsson.
* Shared/API/Cocoa/WKRenderingProgressEventsInternal.h: Removed.
* Shared/API/Cocoa/_WKRenderingProgressEvents.h: Added. Moved the enum definition from
WKWebViewPrivate.h to here.
* Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h: Added.
(renderingProgressEvents): Moved from NavigationState.mm to here.
* UIProcess/API/Cocoa/WKBrowsingContextController.h: Removed observedRenderingProgressEvents
property declaration.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(layoutMilestones): Deleted.
(-[WKBrowsingContextController setObservedRenderingProgressEvents:]): Deleted. This is not
needed for binary compatibility.
(didLayout): Deleted.
(setUpPageLoaderClient): Removed setting up didLayout callback.
* UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h: Removed unused delegate method.
* UIProcess/API/Cocoa/WKWebViewPrivate.h: Import definition of _WKRenderingProgressEvents
from new header.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::renderingProgressEvents): Moved into its own header.
* WebKit2.xcodeproj/project.pbxproj: Updated for file additions and removeals, and moved
WKRenderingProgressEvents.h into a new Deprecated group.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h: Changed the type of
a delegate method parameter to _WKRenderingProgressEvents.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(didLayout): Pass the new type.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInLoadDelegateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsh">trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsInternalh">trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRenderingProgressEventsInternalh">trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-12-27 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] WKWebProcessPlugInLoadDelegate uses the deprecated WKRenderingProgressEvents enum
+ https://bugs.webkit.org/show_bug.cgi?id=139964
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKRenderingProgressEventsInternal.h: Removed.
+
+ * Shared/API/Cocoa/_WKRenderingProgressEvents.h: Added. Moved the enum definition from
+ WKWebViewPrivate.h to here.
+
+ * Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h: Added.
+ (renderingProgressEvents): Moved from NavigationState.mm to here.
+
+ * UIProcess/API/Cocoa/WKBrowsingContextController.h: Removed observedRenderingProgressEvents
+ property declaration.
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (layoutMilestones): Deleted.
+ (-[WKBrowsingContextController setObservedRenderingProgressEvents:]): Deleted. This is not
+ needed for binary compatibility.
+ (didLayout): Deleted.
+ (setUpPageLoaderClient): Removed setting up didLayout callback.
+ * UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h: Removed unused delegate method.
+
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h: Import definition of _WKRenderingProgressEvents
+ from new header.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::renderingProgressEvents): Moved into its own header.
+
+ * WebKit2.xcodeproj/project.pbxproj: Updated for file additions and removeals, and moved
+ WKRenderingProgressEvents.h into a new Deprecated group.
+
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h: Changed the type of
+ a delegate method parameter to _WKRenderingProgressEvents.
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (didLayout): Pass the new type.
+
</ins><span class="cx"> 2014-12-26 Conrad Shultz <conrad_shultz@apple.com>
</span><span class="cx">
</span><span class="cx"> Safari build crashes when "zooming into"/choosing a tab from tab view
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRenderingProgressEventsInternalh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "WKRenderingProgressEvents.h"
-
-#if WK_API_ENABLED
-
-static inline WKRenderingProgressEvents renderingProgressEvents(WKLayoutMilestones milestones)
-{
- WKRenderingProgressEvents events = 0;
-
- if (milestones & kWKDidFirstLayout)
- events |= WKRenderingProgressEventFirstLayout;
-
- if (milestones & kWKDidFirstVisuallyNonEmptyLayout)
- events |= WKRenderingProgressEventFirstVisuallyNonEmptyLayout;
-
- if (milestones & kWKDidHitRelevantRepaintedObjectsAreaThreshold)
- events |= WKRenderingProgressEventFirstPaintWithSignificantArea;
-
- return events;
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h (0 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+typedef NS_OPTIONS(NSUInteger, _WKRenderingProgressEvents) {
+ _WKRenderingProgressEventFirstLayout = 1 << 0,
+ _WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 1,
+ _WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
+ _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 3
+} WK_ENUM_AVAILABLE(10_10, 8_0);
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsInternalh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h (0 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "_WKRenderingProgressEvents.h"
+
+#if WK_API_ENABLED
+
+#import <WebCore/LayoutMilestones.h>
+
+static inline _WKRenderingProgressEvents renderingProgressEvents(WebCore::LayoutMilestones milestones)
+{
+ _WKRenderingProgressEvents events = 0;
+
+ if (milestones & WebCore::DidFirstLayout)
+ events |= _WKRenderingProgressEventFirstLayout;
+
+ if (milestones & WebCore::DidFirstVisuallyNonEmptyLayout)
+ events |= _WKRenderingProgressEventFirstVisuallyNonEmptyLayout;
+
+ if (milestones & WebCore::DidHitRelevantRepaintedObjectsAreaThreshold)
+ events |= _WKRenderingProgressEventFirstPaintWithSignificantArea;
+
+ if (milestones & WebCore::ReachedSessionRestorationRenderTreeSizeThreshold)
+ events |= _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold;
+
+ return events;
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #import <WebKit/WKBrowsingContextGroup.h>
</span><span class="cx"> #import <WebKit/WKFoundation.h>
</span><span class="cx"> #import <WebKit/WKProcessGroup.h>
</span><del>-#import <WebKit/WKRenderingProgressEvents.h>
</del><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="lines">@@ -121,8 +120,6 @@
</span><span class="cx">
</span><span class="cx"> @property(readonly) double estimatedProgress;
</span><span class="cx">
</span><del>-@property (nonatomic) WKRenderingProgressEvents observedRenderingProgressEvents;
-
</del><span class="cx"> #pragma mark Active Document Introspection
</span><span class="cx">
</span><span class="cx"> /* Title of the document associated with the active load. */
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="cx"> #import "WKPagePolicyClientInternal.h"
</span><span class="cx"> #import "WKProcessGroupPrivate.h"
</span><del>-#import "WKRenderingProgressEventsInternal.h"
</del><span class="cx"> #import "WKRetainPtr.h"
</span><span class="cx"> #import "WKURLRequestNS.h"
</span><span class="cx"> #import "WKURLResponseNS.h"
</span><span class="lines">@@ -358,25 +357,6 @@
</span><span class="cx"> return _page->estimatedProgress();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline LayoutMilestones layoutMilestones(WKRenderingProgressEvents events)
-{
- LayoutMilestones milestones = 0;
-
- if (events & WKRenderingProgressEventFirstLayout)
- milestones |= DidFirstLayout;
-
- if (events & WKRenderingProgressEventFirstPaintWithSignificantArea)
- milestones |= DidHitRelevantRepaintedObjectsAreaThreshold;
-
- return milestones;
-}
-
-- (void)setObservedRenderingProgressEvents:(WKRenderingProgressEvents)events
-{
- _observedRenderingProgressEvents = events;
- _page->listenForLayoutMilestones(layoutMilestones(events));
-}
-
</del><span class="cx"> #pragma mark Active Document Introspection
</span><span class="cx">
</span><span class="cx"> - (NSString *)title
</span><span class="lines">@@ -555,15 +535,6 @@
</span><span class="cx"> [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextControllerWebProcessDidCrash:browsingContext];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void didLayout(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef userData, const void* clientInfo)
-{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
- auto loadDelegate = browsingContext->_loadDelegate.get();
-
- if ([loadDelegate respondsToSelector:@selector(browsingContextController:renderingProgressDidChange:)])
- [loadDelegate browsingContextController:browsingContext renderingProgressDidChange:renderingProgressEvents(milestones)];
-}
-
</del><span class="cx"> static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
</span><span class="cx"> {
</span><span class="cx"> WKPageLoaderClientV4 loaderClient;
</span><span class="lines">@@ -588,8 +559,6 @@
</span><span class="cx">
</span><span class="cx"> loaderClient.processDidCrash = processDidCrash;
</span><span class="cx">
</span><del>- loaderClient.didLayout = didLayout;
-
</del><span class="cx"> WKPageSetPageLoaderClient(toAPI(&page), &loaderClient.base);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)browsingContextControllerDidChangeBackForwardList:(WKBrowsingContextController *)sender addedItem:(WKBackForwardListItem *)addedItem removedItems:(NSArray *)removedItems;
</span><span class="cx">
</span><del>-- (void)browsingContextController:(WKBrowsingContextController *)sender renderingProgressDidChange:(WKRenderingProgressEvents)progressEvent;
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -27,12 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-typedef NS_OPTIONS(NSUInteger, _WKRenderingProgressEvents) {
- _WKRenderingProgressEventFirstLayout = 1 << 0,
- _WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 1,
- _WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
- _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 3
-} WK_ENUM_AVAILABLE(10_10, 8_0);
</del><ins>+#import <WebKit/_WKRenderingProgressEvents.h>
</ins><span class="cx">
</span><span class="cx"> typedef NS_ENUM(NSInteger, _WKPaginationMode) {
</span><span class="cx"> _WKPaginationModeUnpaginated,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #import "WebProtectionSpace.h"
</span><span class="cx"> #import "_WKErrorRecoveryAttempting.h"
</span><span class="cx"> #import "_WKFrameHandleInternal.h"
</span><ins>+#import "_WKRenderingProgressEventsInternal.h"
</ins><span class="cx"> #import "_WKSameDocumentNavigationTypeInternal.h"
</span><span class="cx"> #import <WebCore/Credential.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -599,25 +600,6 @@
</span><span class="cx"> m_navigationState.m_navigations.remove(navigationID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static _WKRenderingProgressEvents renderingProgressEvents(WebCore::LayoutMilestones milestones)
-{
- _WKRenderingProgressEvents events = 0;
-
- if (milestones & WebCore::DidFirstLayout)
- events |= _WKRenderingProgressEventFirstLayout;
-
- if (milestones & WebCore::DidFirstVisuallyNonEmptyLayout)
- events |= _WKRenderingProgressEventFirstVisuallyNonEmptyLayout;
-
- if (milestones & WebCore::DidHitRelevantRepaintedObjectsAreaThreshold)
- events |= _WKRenderingProgressEventFirstPaintWithSignificantArea;
-
- if (milestones & WebCore::ReachedSessionRestorationRenderTreeSizeThreshold)
- events |= _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold;
-
- return events;
-}
-
</del><span class="cx"> void NavigationState::LoaderClient::didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones layoutMilestones, API::Object*)
</span><span class="cx"> {
</span><span class="cx"> if (!m_navigationState.m_navigationDelegateMethods.webViewRenderingProgressDidChange)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> 1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC945D16515ED200D68AAE /* DockBottom.pdf */; };
</span><span class="cx"> 1F335BC0185B84F0001A201A /* WKWebProcessPlugInLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1F604BAA1889FBB800EE0395 /* WKRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */; };
</del><ins>+ 1F604BAA1889FBB800EE0395 /* _WKRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA71889FA7400EE0395 /* _WKRenderingProgressEventsInternal.h */; };
</ins><span class="cx"> 1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */; };
</span><span class="cx"> 1F7506AE1859162200EC0FF7 /* WKWebProcessPlugInHitTestResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */; };
</span><span class="cx"> 1F7506AF1859162800EC0FF7 /* WKWebProcessPlugInNodeHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0181701858DC1600F92884 /* WKWebProcessPlugInNodeHandle.mm */; };
</span><span class="lines">@@ -742,6 +742,7 @@
</span><span class="cx"> 376C511A1957452E0007B0FA /* _WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 376C511D19574F5F0007B0FA /* _WKSecurityOriginInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */; };
</span><span class="cx"> 37716A5A195B910500EE8B1B /* ProcessAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */; };
</span><ins>+ 377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2552,7 +2553,7 @@
</span><span class="cx"> 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorldInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInLoadDelegate.h; sourceTree = "<group>"; };
</span><span class="cx"> 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderingProgressEvents.h; sourceTree = "<group>"; };
</span><del>- 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderingProgressEventsInternal.h; sourceTree = "<group>"; };
</del><ins>+ 1F604BA71889FA7400EE0395 /* _WKRenderingProgressEventsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRenderingProgressEventsInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIDownloadClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroup.h; sourceTree = "<group>"; };
</span><span class="cx"> 1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInPageGroup.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -2793,6 +2794,7 @@
</span><span class="cx"> 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSecurityOrigin.h; sourceTree = "<group>"; };
</span><span class="cx"> 376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSecurityOriginInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessAssertion.cpp; sourceTree = "<group>"; };
</span><ins>+ 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRenderingProgressEvents.h; sourceTree = "<group>"; };
</ins><span class="cx"> 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
</span><span class="cx"> 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentInjectedFrames.h; sourceTree = "<group>"; };
</span><span class="cx"> 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserScriptInjectionTime.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5063,6 +5065,14 @@
</span><span class="cx"> path = posix;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 377216B91A4E710400DCA718 /* Deprecated */ = {
+ isa = PBXGroup;
+ children = (
+ 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
+ );
+ name = Deprecated;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5197,6 +5207,7 @@
</span><span class="cx"> 37DFA6FE1810BB2D001F4A9F /* Cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 377216B91A4E710400DCA718 /* Deprecated */,
</ins><span class="cx"> 373D122118A473010066D9CC /* _WKFrameHandle.h */,
</span><span class="cx"> 373D122018A473010066D9CC /* _WKFrameHandle.mm */,
</span><span class="cx"> 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
</span><span class="lines">@@ -5208,6 +5219,8 @@
</span><span class="cx"> 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
</span><span class="cx"> 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
</span><span class="cx"> 1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
</span><ins>+ 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */,
+ 1F604BA71889FA7400EE0395 /* _WKRenderingProgressEventsInternal.h */,
</ins><span class="cx"> 376311F81A3FB30B005A2E51 /* _WKSameDocumentNavigationType.h */,
</span><span class="cx"> 376311FA1A3FB38B005A2E51 /* _WKSameDocumentNavigationTypeInternal.h */,
</span><span class="cx"> 1AC1337E18590AE400F3EC05 /* RemoteObjectRegistry.h */,
</span><span class="lines">@@ -5225,8 +5238,6 @@
</span><span class="cx"> 1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
</span><span class="cx"> 1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */,
</span><span class="cx"> 1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */,
</span><del>- 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
- 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */,
</del><span class="cx"> );
</span><span class="cx"> path = Cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7406,6 +7417,7 @@
</span><span class="cx"> 513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */,
</span><span class="cx"> BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */,
</span><span class="cx"> 51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
</span><ins>+ 377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */,
</ins><span class="cx"> E152551B17011819003D7ADB /* NetworkResourceLoaderMessages.h in Headers */,
</span><span class="cx"> 51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */,
</span><span class="cx"> 51829DA61637C70C000953D6 /* NetworkResourceLoadScheduler.h in Headers */,
</span><span class="lines">@@ -7927,7 +7939,7 @@
</span><span class="cx"> 1A9E329B1822E1CC00F5D04C /* WKRemoteObject.h in Headers */,
</span><span class="cx"> 1A9E329F1822FEDD00F5D04C /* WKRemoteObjectCoder.h in Headers */,
</span><span class="cx"> 1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */,
</span><del>- 1F604BAA1889FBB800EE0395 /* WKRenderingProgressEventsInternal.h in Headers */,
</del><ins>+ 1F604BAA1889FBB800EE0395 /* _WKRenderingProgressEventsInternal.h in Headers */,
</ins><span class="cx"> 37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */,
</span><span class="cx"> 37608823150414F700FC82C7 /* WKRenderObject.h in Headers */,
</span><span class="cx"> 3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -22,8 +22,10 @@
</span><span class="cx"> * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <WebKit/WKRenderingProgressEvents.h>
</span><ins>+#import <WebKit/_WKRenderingProgressEvents.h>
</ins><span class="cx"> #import <WebKit/_WKSameDocumentNavigationType.h>
</span><span class="cx">
</span><span class="cx"> @class WKWebProcessPlugInBrowsingContextController;
</span><span class="lines">@@ -48,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> // Layout
</span><span class="cx"> - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didLayoutForFrame:(WKWebProcessPlugInFrame *)frame;
</span><del>-- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller renderingProgressDidChange:(WKRenderingProgressEvents)events;
</del><ins>+- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller renderingProgressDidChange:(_WKRenderingProgressEvents)events;
</ins><span class="cx"> - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didFirstVisuallyNonEmptyLayoutForFrame:(WKWebProcessPlugInFrame *)frame;
</span><span class="cx">
</span><span class="cx"> // Resource loading
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (177759 => 177760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-12-27 17:53:23 UTC (rev 177759)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-12-27 18:14:41 UTC (rev 177760)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #import "WKNSString.h"
</span><span class="cx"> #import "WKNSURL.h"
</span><span class="cx"> #import "WKNSURLRequest.h"
</span><del>-#import "WKRenderingProgressEventsInternal.h"
</del><span class="cx"> #import "WKRetainPtr.h"
</span><span class="cx"> #import "WKStringCF.h"
</span><span class="cx"> #import "WKURLRequestNS.h"
</span><span class="lines">@@ -56,6 +55,7 @@
</span><span class="cx"> #import "WebPage.h"
</span><span class="cx"> #import "WebProcess.h"
</span><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><ins>+#import "_WKRenderingProgressEventsInternal.h"
</ins><span class="cx"> #import "_WKSameDocumentNavigationTypeInternal.h"
</span><span class="cx"> #import <WebCore/Document.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> auto loadDelegate = pluginContextController->_loadDelegate.get();
</span><span class="cx">
</span><span class="cx"> if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:renderingProgressDidChange:)])
</span><del>- [loadDelegate webProcessPlugInBrowserContextController:pluginContextController renderingProgressDidChange:renderingProgressEvents(milestones)];
</del><ins>+ [loadDelegate webProcessPlugInBrowserContextController:pluginContextController renderingProgressDidChange:renderingProgressEvents(toLayoutMilestones(milestones))];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didFirstVisuallyNonEmptyLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
</span></span></pre>
</div>
</div>
</body>
</html>