Changeset 159875 in webkit


Ignore:
Timestamp:
Nov 29, 2013 1:15:28 PM (10 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Expose loadAlternateHTMLString via the API
https://bugs.webkit.org/show_bug.cgi?id=125019

Reviewed by Sam Weinig.

  • UIProcess/API/Cocoa/WKBrowsingContextController.h: Declared new method.
  • UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(-[WKBrowsingContextController loadAlternateHTMLString:baseURL:forUnreachableURL:]): Added.
Calls WebPageProxy::loadAlternateHTMLString.

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r159874 r159875  
     12013-11-29  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Expose loadAlternateHTMLString via the API
     4        https://bugs.webkit.org/show_bug.cgi?id=125019
     5
     6        Reviewed by Sam Weinig.
     7
     8        * UIProcess/API/Cocoa/WKBrowsingContextController.h: Declared new method.
     9        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
     10        (-[WKBrowsingContextController loadAlternateHTMLString:baseURL:forUnreachableURL:]): Added.
     11        Calls WebPageProxy::loadAlternateHTMLString.
     12
    1132013-11-29  Sam Weinig  <sam@webkit.org>
    214
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h

    r159874 r159875  
    7171- (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL userData:(id)userData;
    7272
     73- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
     74
    7375/* Load a page using the passed in data as its contents. */
    7476- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL;
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r159874 r159875  
    4848#import "WebData.h"
    4949#import "WebPageProxy.h"
     50#import <WebCore/CFURLExtras.h>
    5051#import <wtf/ObjcRuntimeExtras.h>
    5152#import <wtf/RetainPtr.h>
     
    5758#import "WKProcessGroupInternal.h"
    5859
     60using namespace WebCore;
    5961using namespace WebKit;
    6062
     
    215217
    216218    WKPageLoadHTMLStringWithUserData(_pageRef.get(), wkHTMLString.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
     219}
     220
     221- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL
     222{
     223    CString baseURLString;
     224    getURLBytes((CFURLRef)baseURL, baseURLString);
     225
     226    CString unreachableURLString;
     227    getURLBytes((CFURLRef)unreachableURL, unreachableURLString);
     228
     229    toImpl(_pageRef.get())->loadAlternateHTMLString(string, String::fromUTF8(baseURLString), String::fromUTF8(unreachableURLString));
    217230}
    218231
Note: See TracChangeset for help on using the changeset viewer.