Diff
Modified: trunk/Source/WebKit2/ChangeLog (177759 => 177760)
--- 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)
@@ -1,3 +1,42 @@
+2014-12-27 Dan Bernstein <[email protected]>
+
+ [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.
+
2014-12-26 Conrad Shultz <[email protected]>
Safari build crashes when "zooming into"/choosing a tab from tab view
Deleted: trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h (177759 => 177760)
--- 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)
@@ -1,46 +0,0 @@
-/*
- * 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
Added: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h (0 => 177760)
--- 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)
@@ -0,0 +1,37 @@
+/*
+ * 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
Added: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h (0 => 177760)
--- 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)
@@ -0,0 +1,51 @@
+/*
+ * 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
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h (177759 => 177760)
--- 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)
@@ -27,7 +27,6 @@
#import <WebKit/WKBrowsingContextGroup.h>
#import <WebKit/WKFoundation.h>
#import <WebKit/WKProcessGroup.h>
-#import <WebKit/WKRenderingProgressEvents.h>
#if WK_API_ENABLED
@@ -121,8 +120,6 @@
@property(readonly) double estimatedProgress;
-@property (nonatomic) WKRenderingProgressEvents observedRenderingProgressEvents;
-
#pragma mark Active Document Introspection
/* Title of the document associated with the active load. */
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (177759 => 177760)
--- 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)
@@ -47,7 +47,6 @@
#import "WKNSURLExtras.h"
#import "WKPagePolicyClientInternal.h"
#import "WKProcessGroupPrivate.h"
-#import "WKRenderingProgressEventsInternal.h"
#import "WKRetainPtr.h"
#import "WKURLRequestNS.h"
#import "WKURLResponseNS.h"
@@ -358,25 +357,6 @@
return _page->estimatedProgress();
}
-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));
-}
-
#pragma mark Active Document Introspection
- (NSString *)title
@@ -555,15 +535,6 @@
[(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextControllerWebProcessDidCrash:browsingContext];
}
-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)];
-}
-
static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
{
WKPageLoaderClientV4 loaderClient;
@@ -588,8 +559,6 @@
loaderClient.processDidCrash = processDidCrash;
- loaderClient.didLayout = didLayout;
-
WKPageSetPageLoaderClient(toAPI(&page), &loaderClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h (177759 => 177760)
--- 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)
@@ -59,8 +59,6 @@
- (void)browsingContextControllerDidChangeBackForwardList:(WKBrowsingContextController *)sender addedItem:(WKBackForwardListItem *)addedItem removedItems:(NSArray *)removedItems;
-- (void)browsingContextController:(WKBrowsingContextController *)sender renderingProgressDidChange:(WKRenderingProgressEvents)progressEvent;
-
@end
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (177759 => 177760)
--- 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)
@@ -27,12 +27,7 @@
#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);
+#import <WebKit/_WKRenderingProgressEvents.h>
typedef NS_ENUM(NSInteger, _WKPaginationMode) {
_WKPaginationModeUnpaginated,
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (177759 => 177760)
--- 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)
@@ -56,6 +56,7 @@
#import "WebProtectionSpace.h"
#import "_WKErrorRecoveryAttempting.h"
#import "_WKFrameHandleInternal.h"
+#import "_WKRenderingProgressEventsInternal.h"
#import "_WKSameDocumentNavigationTypeInternal.h"
#import <WebCore/Credential.h>
#import <wtf/NeverDestroyed.h>
@@ -599,25 +600,6 @@
m_navigationState.m_navigations.remove(navigationID);
}
-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;
-}
-
void NavigationState::LoaderClient::didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones layoutMilestones, API::Object*)
{
if (!m_navigationState.m_navigationDelegateMethods.webViewRenderingProgressDidChange)
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (177759 => 177760)
--- 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)
@@ -516,7 +516,7 @@
1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC945D16515ED200D68AAE /* DockBottom.pdf */; };
1F335BC0185B84F0001A201A /* WKWebProcessPlugInLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 1F604BAA1889FBB800EE0395 /* WKRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */; };
+ 1F604BAA1889FBB800EE0395 /* _WKRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA71889FA7400EE0395 /* _WKRenderingProgressEventsInternal.h */; };
1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */; };
1F7506AE1859162200EC0FF7 /* WKWebProcessPlugInHitTestResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */; };
1F7506AF1859162800EC0FF7 /* WKWebProcessPlugInNodeHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0181701858DC1600F92884 /* WKWebProcessPlugInNodeHandle.mm */; };
@@ -742,6 +742,7 @@
376C511A1957452E0007B0FA /* _WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
376C511D19574F5F0007B0FA /* _WKSecurityOriginInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */; };
37716A5A195B910500EE8B1B /* ProcessAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */; };
+ 377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2552,7 +2553,7 @@
1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorldInternal.h; sourceTree = "<group>"; };
1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInLoadDelegate.h; sourceTree = "<group>"; };
1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderingProgressEvents.h; sourceTree = "<group>"; };
- 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderingProgressEventsInternal.h; sourceTree = "<group>"; };
+ 1F604BA71889FA7400EE0395 /* _WKRenderingProgressEventsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRenderingProgressEventsInternal.h; sourceTree = "<group>"; };
1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIDownloadClient.h; sourceTree = "<group>"; };
1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroup.h; sourceTree = "<group>"; };
1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInPageGroup.mm; sourceTree = "<group>"; };
@@ -2793,6 +2794,7 @@
376C51181957452E0007B0FA /* _WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSecurityOrigin.h; sourceTree = "<group>"; };
376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSecurityOriginInternal.h; sourceTree = "<group>"; };
37716A59195B910500EE8B1B /* ProcessAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessAssertion.cpp; sourceTree = "<group>"; };
+ 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRenderingProgressEvents.h; sourceTree = "<group>"; };
377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentInjectedFrames.h; sourceTree = "<group>"; };
377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserScriptInjectionTime.h; sourceTree = "<group>"; };
@@ -5063,6 +5065,14 @@
path = posix;
sourceTree = "<group>";
};
+ 377216B91A4E710400DCA718 /* Deprecated */ = {
+ isa = PBXGroup;
+ children = (
+ 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
+ );
+ name = Deprecated;
+ sourceTree = "<group>";
+ };
37C4C08318149C2A003688B9 /* Cocoa */ = {
isa = PBXGroup;
children = (
@@ -5197,6 +5207,7 @@
37DFA6FE1810BB2D001F4A9F /* Cocoa */ = {
isa = PBXGroup;
children = (
+ 377216B91A4E710400DCA718 /* Deprecated */,
373D122118A473010066D9CC /* _WKFrameHandle.h */,
373D122018A473010066D9CC /* _WKFrameHandle.mm */,
373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
@@ -5208,6 +5219,8 @@
1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
+ 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */,
+ 1F604BA71889FA7400EE0395 /* _WKRenderingProgressEventsInternal.h */,
376311F81A3FB30B005A2E51 /* _WKSameDocumentNavigationType.h */,
376311FA1A3FB38B005A2E51 /* _WKSameDocumentNavigationTypeInternal.h */,
1AC1337E18590AE400F3EC05 /* RemoteObjectRegistry.h */,
@@ -5225,8 +5238,6 @@
1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */,
1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */,
- 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
- 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */,
);
path = Cocoa;
sourceTree = "<group>";
@@ -7406,6 +7417,7 @@
513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */,
BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */,
51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
+ 377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */,
E152551B17011819003D7ADB /* NetworkResourceLoaderMessages.h in Headers */,
51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */,
51829DA61637C70C000953D6 /* NetworkResourceLoadScheduler.h in Headers */,
@@ -7927,7 +7939,7 @@
1A9E329B1822E1CC00F5D04C /* WKRemoteObject.h in Headers */,
1A9E329F1822FEDD00F5D04C /* WKRemoteObjectCoder.h in Headers */,
1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */,
- 1F604BAA1889FBB800EE0395 /* WKRenderingProgressEventsInternal.h in Headers */,
+ 1F604BAA1889FBB800EE0395 /* _WKRenderingProgressEventsInternal.h in Headers */,
37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */,
37608823150414F700FC82C7 /* WKRenderObject.h in Headers */,
3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h (177759 => 177760)
--- 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)
@@ -22,8 +22,10 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#import <Foundation/Foundation.h>
#import <WebKit/WKRenderingProgressEvents.h>
+#import <WebKit/_WKRenderingProgressEvents.h>
#import <WebKit/_WKSameDocumentNavigationType.h>
@class WKWebProcessPlugInBrowsingContextController;
@@ -48,7 +50,7 @@
// Layout
- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didLayoutForFrame:(WKWebProcessPlugInFrame *)frame;
-- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller renderingProgressDidChange:(WKRenderingProgressEvents)events;
+- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller renderingProgressDidChange:(_WKRenderingProgressEvents)events;
- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didFirstVisuallyNonEmptyLayoutForFrame:(WKWebProcessPlugInFrame *)frame;
// Resource loading
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (177759 => 177760)
--- 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)
@@ -41,7 +41,6 @@
#import "WKNSString.h"
#import "WKNSURL.h"
#import "WKNSURLRequest.h"
-#import "WKRenderingProgressEventsInternal.h"
#import "WKRetainPtr.h"
#import "WKStringCF.h"
#import "WKURLRequestNS.h"
@@ -56,6 +55,7 @@
#import "WebPage.h"
#import "WebProcess.h"
#import "_WKRemoteObjectRegistryInternal.h"
+#import "_WKRenderingProgressEventsInternal.h"
#import "_WKSameDocumentNavigationTypeInternal.h"
#import <WebCore/Document.h>
#import <WebCore/Frame.h>
@@ -179,7 +179,7 @@
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:renderingProgressDidChange:)])
- [loadDelegate webProcessPlugInBrowserContextController:pluginContextController renderingProgressDidChange:renderingProgressEvents(milestones)];
+ [loadDelegate webProcessPlugInBrowserContextController:pluginContextController renderingProgressDidChange:renderingProgressEvents(toLayoutMilestones(milestones))];
}
static void didFirstVisuallyNonEmptyLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
