Changeset 163053 in webkit


Ignore:
Timestamp:
Jan 29, 2014 5:17:57 PM (10 years ago)
Author:
andersca@apple.com
Message:

-[WKWebView loadRequest:] should return a WKNavigation
​https://bugs.webkit.org/show_bug.cgi?id=127873

Reviewed by Dan Bernstein.

Source/WebKit2:

For now this just returns a dummy navigation.

  • UIProcess/API/Cocoa/WKNavigation.h:
  • UIProcess/API/Cocoa/WKNavigation.mm:

(-[WKNavigation initWithRequest:]):
(-[WKNavigation request]):

  • UIProcess/API/Cocoa/WKNavigationInternal.h: Added.
  • UIProcess/API/Cocoa/WKWebView.h:
  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView loadRequest:]):

  • WebKit2.xcodeproj/project.pbxproj:

Tools:

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm: Added.

(TEST):

Location:
trunk
Files:
1 added
8 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r163049 r163053  
     12014-01-29  Anders Carlsson  <andersca@apple.com>
     2
     3        -[WKWebView loadRequest:] should return a WKNavigation
     4        https://bugs.webkit.org/show_bug.cgi?id=127873
     5
     6        Reviewed by Dan Bernstein.
     7
     8        For now this just returns a dummy navigation.
     9
     10        * UIProcess/API/Cocoa/WKNavigation.h:
     11        * UIProcess/API/Cocoa/WKNavigation.mm:
     12        (-[WKNavigation initWithRequest:]):
     13        (-[WKNavigation request]):
     14        * UIProcess/API/Cocoa/WKNavigationInternal.h: Added.
     15        * UIProcess/API/Cocoa/WKWebView.h:
     16        * UIProcess/API/Cocoa/WKWebView.mm:
     17        (-[WKWebView loadRequest:]):
     18        * WebKit2.xcodeproj/project.pbxproj:
     19
    1202014-01-29  Anders Carlsson  <andersca@apple.com>
    221

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h

    r162959 r163053  
    3232@interface WKNavigation : NSObject
    3333
     34@property (nonatomic, readonly) NSURLRequest *request;
     35
    3436@end
    3537

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm

    r162959 r163053  
    2424 */
    2525
    26 #include "config.h"
    27 #include "WKNavigation.h"
     26#import "config.h"
     27#import "WKNavigation.h"
     28
     29#import <wtf/RetainPtr.h>
    2830
    2931#if WK_API_ENABLED
    3032
    31 @implementation WKNavigation
     33@implementation WKNavigation {
     34    RetainPtr<NSURLRequest> _request;
     35}
     36
     37- (instancetype)initWithRequest:(NSURLRequest *)request
     38{
     39    if (!(self = [super init]))
     40        return nil;
     41
     42    _request = adoptNS([request copy]);
     43
     44    return self;
     45}
     46
     47- (NSURLRequest *)request
     48{
     49    return _request.get();
     50}
    3251
    3352@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h

    r163050 r163053  
    2424 */
    2525
    26 #include "config.h"
    27 #include "WKNavigation.h"
     26#import "WKNavigation.h"
    2827
    2928#if WK_API_ENABLED
    3029
    31 @implementation WKNavigation
     30@interface WKNavigation ()
     31
     32- (instancetype)initWithRequest:(NSURLRequest *)request;
    3233
    3334@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h

    r162899 r163053  
    3535#endif
    3636
     37@class WKNavigation;
    3738@class WKWebViewConfiguration;
    3839
    … …  
    6768- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
    6869
    69 // FIXME: This should return a WKNavigation object.
    70 - (void)loadRequest:(NSURLRequest *)request;
     70- (WKNavigation *)loadRequest:(NSURLRequest *)request;
    7171
    7272@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r163042 r163053  
    2929#if WK_API_ENABLED
    3030
     31#import "WKNavigationInternal.h"
    3132#import "WKProcessClass.h"
    3233#import "WKWebViewConfiguration.h"
    … …  
    121122}
    122123
    123 - (void)loadRequest:(NSURLRequest *)request
     124- (WKNavigation *)loadRequest:(NSURLRequest *)request
    124125{
    125126    _page->loadRequest(request);
     127
     128    return [[[WKNavigation alloc] initWithRequest:request] autorelease];
    126129}
    127130

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r162981 r163053  
    291291                1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB8A1F518400B9D00E9AE69 /* WKPageFindMatchesClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    292292                1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB8A1F718400BB800E9AE69 /* WKPageContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
     293                1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABC3DF01899C6B6004F0626 /* WKNavigationInternal.h */; };
    293294                1AC1336718565B5700F3EC05 /* UserData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1336518565B5700F3EC05 /* UserData.cpp */; };
    294295                1AC1336818565B5700F3EC05 /* UserData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1336618565B5700F3EC05 /* UserData.h */; };
    … …  
    19351936                1AB8A1F518400B9D00E9AE69 /* WKPageFindMatchesClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageFindMatchesClient.h; sourceTree = "<group>"; };
    19361937                1AB8A1F718400BB800E9AE69 /* WKPageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageContextMenuClient.h; sourceTree = "<group>"; };
     1938                1ABC3DF01899C6B6004F0626 /* WKNavigationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationInternal.h; sourceTree = "<group>"; };
    19371939                1AC1336518565B5700F3EC05 /* UserData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserData.cpp; sourceTree = "<group>"; };
    19381940                1AC1336618565B5700F3EC05 /* UserData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserData.h; sourceTree = "<group>"; };
    … …  
    42394241                                1A5B1C4F1898606F004FCF9B /* WKNavigation.h */,
    42404242                                1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */,
     4243                                1ABC3DF01899C6B6004F0626 /* WKNavigationInternal.h */,
    42414244                                1AFDD3161891C94700153970 /* WKPreferences.h */,
    42424245                                1AFDD3181891CA1200153970 /* WKPreferences.mm */,
    … …  
    61346137                                BC017D2116263308007054F5 /* WKDOMTextIterator.h in Headers */,
    61356138                                37DFA7001810BB92001F4A9F /* WKFoundation.h in Headers */,
     6139                                1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */,
    61366140                                1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */,
    61376141                                BCBAACEB145225E30053F82F /* WKProcessGroup.h in Headers */,

  • trunk/Tools/ChangeLog

    r163043 r163053  
     12014-01-29  Anders Carlsson  <andersca@apple.com>
     2
     3        -[WKWebView loadRequest:] should return a WKNavigation
     4        https://bugs.webkit.org/show_bug.cgi?id=127873
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     9        * TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm: Added.
     10        (TEST):
     11
    1122014-01-29  Tim Horton  <timothy_horton@apple.com>
    213

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r161785 r163053  
    2727                1AA9BAE418500450003B6BC6 /* WeakObjCPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA9BAE218500450003B6BC6 /* WeakObjCPtr.mm */; };
    2828                1AA9E55914980A9900001A8A /* Functional.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA9E55714980A9900001A8A /* Functional.cpp */; };
     29                1ABC3DEF1899BE6D004F0626 /* Navigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ABC3DED1899BE6D004F0626 /* Navigation.mm */; };
    2930                1ADBEFAE130C689C00D61D19 /* ForceRepaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADBEFAD130C689C00D61D19 /* ForceRepaint.cpp */; };
    3031                1ADBEFE3130C6AA100D61D19 /* simple-accelerated-compositing.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */; };
    … …  
    348349                1AA9BAE218500450003B6BC6 /* WeakObjCPtr.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WeakObjCPtr.mm; sourceTree = "<group>"; };
    349350                1AA9E55714980A9900001A8A /* Functional.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functional.cpp; sourceTree = "<group>"; };
     351                1ABC3DED1899BE6D004F0626 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Navigation.mm; sourceTree = "<group>"; };
    350352                1ADBEFAD130C689C00D61D19 /* ForceRepaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForceRepaint.cpp; sourceTree = "<group>"; };
    351353                1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "simple-accelerated-compositing.html"; sourceTree = "<group>"; };
    … …  
    668670                        sourceTree = "<group>";
    669671                };
     672                1ABC3DEC1899BE55004F0626 /* WebKit2 Cocoa */ = {
     673                        isa = PBXGroup;
     674                        children = (
     675                                1ABC3DED1899BE6D004F0626 /* Navigation.mm */,
     676                        );
     677                        name = "WebKit2 Cocoa";
     678                        path = WebKit2Cocoa;
     679                        sourceTree = "<group>";
     680                };
    670681                2E9660DC16C07D7B00371B42 /* ios */ = {
    671682                        isa = PBXGroup;
    … …  
    923934                                440A1D3614A01000008A66F2 /* WebCore */,
    924935                                BC9096411255616000083756 /* WebKit2 */,
     936                                1ABC3DEC1899BE55004F0626 /* WebKit2 Cocoa */,
    925937                                BC3C4C6F14575B1D0025FB62 /* WebKit2 Objective-C */,
    926938                                BC9096461255618900083756 /* WTF */,
    … …  
    11461158                                5142B2711517C88B00C32B19 /* ContextMenuCanCopyURL.mm in Sources */,
    11471159                                F6F3F29113342FEB00A6BF19 /* CookieManager.cpp in Sources */,
     1160                                1ABC3DEF1899BE6D004F0626 /* Navigation.mm in Sources */,
    11481161                                26A2C72F15E2E73C005B1A14 /* CString.cpp in Sources */,
    11491162                                29AB8AA1164C735800D49BEC /* CustomProtocolsTest.mm in Sources */,

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm

    r163050 r163053  
    2525
    2626#include "config.h"
    27 #include "WKNavigation.h"
     27
     28#import <WebKit2/WKNavigation.h>
     29#import <WebKit2/WKWebView.h>
     30#import <wtf/RetainPtr.h>
     31#import "Test.h"
    2832
    2933#if WK_API_ENABLED
    3034
    31 @implementation WKNavigation
     35TEST(WKNavigation, LoadRequest)
     36{
     37    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    3238
    33 @end
     39    NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
     40
     41    WKNavigation *navigation = [webView loadRequest:request];
     42    ASSERT_NOT_NULL(navigation);
     43    ASSERT_TRUE([navigation.request isEqual:request]);
     44}
    3445
    3546#endif
Note: See TracChangeset for help on using the changeset viewer.