Changeset 162259 in webkit
- Timestamp:
- Jan 18, 2014 10:30:29 AM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r162245 r162259 1 2014-01-18 Yongjun Zhang <yongjun_zhang@apple.com> 2 3 Make WKRenderingProgressEvents a shareable API. 4 https://bugs.webkit.org/show_bug.cgi?id=127213 5 6 Reviewed by Dan Bernstein. 7 8 Move WKRenderingProgressEvents from UIProcess to Shared, so that an inject bundle 9 could also use this enum when listening to layout milestones. 10 11 * Shared/API/Cocoa/WKRenderingProgressEvents.h: Added. 12 (NS_OPTIONS): 13 * Shared/API/Cocoa/WKRenderingProgressEventsInternal.h: Added. 14 (renderingProgressEvents): 15 * UIProcess/API/Cocoa/WKBrowsingContextController.h: Move WKRenderingProgressEvents to Shared/API/Cocoa/WKRenderingProgressEvents.h. 16 * UIProcess/API/Cocoa/WKBrowsingContextController.mm: Move renderingProgressEvents() to WKRenderingProgressEventsInternal.h. 17 * WebKit2.xcodeproj/project.pbxproj: 18 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h: Add 19 webProcessPlugInBrowserContextController:renderingProgressDidChange: to load delegate. 20 * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm: 21 (didLayout): 22 (setUpPageLoaderClient): Also listen to didLayout callback for layout milestones. 23 1 24 2014-01-17 Commit Queue <commit-queue@webkit.org> 2 25 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h
r161292 r162259 28 28 #import <WebKit2/WKFoundation.h> 29 29 #import <WebKit2/WKProcessGroup.h> 30 #import <WebKit2/WKRenderingProgressEvents.h> 30 31 31 32 #if WK_API_ENABLED … … 36 37 @protocol WKBrowsingContextLoadDelegate; 37 38 @protocol WKBrowsingContextPolicyDelegate; 38 39 typedef NS_OPTIONS(NSUInteger, WKRenderingProgressEvents) {40 WKRenderingProgressEventFirstLayout = 1 << 0,41 WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,42 };43 39 44 40 WK_API_CLASS -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm
r162141 r162259 50 50 #import "WKProcessGroupInternal.h" 51 51 #import "WKRemoteObjectRegistryInternal.h" 52 #import "WKRenderingProgressEventsInternal.h" 52 53 #import "WKRetainPtr.h" 53 54 #import "WKURLRequestNS.h" … … 594 595 if ([loadDelegate respondsToSelector:@selector(browsingContextControllerWebProcessDidCrash:)]) 595 596 [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextControllerWebProcessDidCrash:browsingContext]; 596 }597 598 static inline WKRenderingProgressEvents renderingProgressEvents(WKLayoutMilestones milestones)599 {600 WKRenderingProgressEvents events = 0;601 602 if (milestones & kWKDidFirstLayout)603 events |= WKRenderingProgressEventFirstLayout;604 605 if (milestones & kWKDidHitRelevantRepaintedObjectsAreaThreshold)606 events |= WKRenderingProgressEventFirstPaintWithSignificantArea;607 608 return events;609 597 } 610 598 -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r162245 r162259 352 352 1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC945D16515ED200D68AAE /* DockBottom.pdf */; }; 353 353 1F335BC0185B84F0001A201A /* WKWebProcessPlugInLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 354 1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Public, ); }; }; 355 1F604BAA1889FBB800EE0395 /* WKRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */; }; 354 356 1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */; }; 355 357 1F7506AE1859162200EC0FF7 /* WKWebProcessPlugInHitTestResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */; }; … … 1996 1998 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorldInternal.h; sourceTree = "<group>"; }; 1997 1999 1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInLoadDelegate.h; sourceTree = "<group>"; }; 2000 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderingProgressEvents.h; sourceTree = "<group>"; }; 2001 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderingProgressEventsInternal.h; sourceTree = "<group>"; }; 1998 2002 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroup.h; sourceTree = "<group>"; }; 1999 2003 1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInPageGroup.mm; sourceTree = "<group>"; }; … … 4235 4239 1A9E32881821636900F5D04C /* WKRemoteObjectRegistry.mm */, 4236 4240 1A9E32A01823018900F5D04C /* WKRemoteObjectRegistryInternal.h */, 4241 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */, 4242 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */, 4237 4243 ); 4238 4244 path = Cocoa; … … 6585 6591 1C8E293912761E5B00BC7BD0 /* WKInspector.h in Headers */, 6586 6592 6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers */, 6593 1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */, 6587 6594 51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */, 6588 6595 33D3A3B61339600B00709BE4 /* WKMediaCacheManager.h in Headers */, … … 6629 6636 F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */, 6630 6637 BC407604124FF0270068F20A /* WKSerializedScriptValue.h in Headers */, 6638 1F604BAA1889FBB800EE0395 /* WKRenderingProgressEventsInternal.h in Headers */, 6631 6639 1F7506B81859165D00EC0FF7 /* WKWebProcessPlugInFrameInternal.h in Headers */, 6632 6640 F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */, -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h
r162203 r162259 24 24 */ 25 25 #import <Foundation/Foundation.h> 26 #import <WebKit2/WKRenderingProgressEvents.h> 26 27 27 28 @class WKWebProcessPlugInBrowsingContextController; … … 44 45 // Layout 45 46 - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didLayoutForFrame:(WKWebProcessPlugInFrame *)frame; 47 - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller renderingProgressDidChange:(WKRenderingProgressEvents)events; 46 48 47 49 // Resource loading -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
r162203 r162259 38 38 #import "WKNSError.h" 39 39 #import "WKRemoteObjectRegistryInternal.h" 40 #import "WKRenderingProgressEventsInternal.h" 40 41 #import "WKRetainPtr.h" 41 42 #import "WKURLRequestNS.h" … … 133 134 } 134 135 136 static void didLayout(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo) 137 { 138 WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo; 139 auto loadDelegate = pluginContextController->_loadDelegate.get(); 140 141 if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:renderingProgressDidChange:)]) 142 [loadDelegate webProcessPlugInBrowserContextController:pluginContextController renderingProgressDidChange:renderingProgressEvents(milestones)]; 143 } 144 135 145 static void setUpPageLoaderClient(WKWebProcessPlugInBrowserContextController *contextController, WebPage& page) 136 146 { … … 149 159 150 160 client.didLayoutForFrame = didLayoutForFrame; 161 client.didLayout = didLayout; 151 162 152 163 page.initializeInjectedBundleLoaderClient(&client.base);
Note: See TracChangeset
for help on using the changeset viewer.