Changeset 175607 in webkit


Ignore:
Timestamp:
Nov 4, 2014 8:56:27 PM (9 years ago)
Author:
aestes@apple.com
Message:

[iOS] Stop using +[NSURL _web_URLWithWTFString:relativeToURL:] in WKPDFView
https://bugs.webkit.org/show_bug.cgi?id=138357

Rubber-stamped by Dan Bernstein.

During patch review for r175595 I changed from using +URLWithString:relativeToURL: to using
+_web_URLWithWTFString:relativeToURL: to append a page number fragment to the document URL.
If the base URL already contains a fragment, +_web_URLWithWTFString:relativeToURL: appends to the existing
fragment whereas +URLWithString:relativeToURL: replaces the existing fragment. I want the latter behavior.

  • UIProcess/ios/WKPDFView.mm:

(-[WKPDFView _URLForLinkAnnotation:]):

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r175597 r175607  
     12014-11-04  Andy Estes  <aestes@apple.com>
     2
     3        [iOS] Stop using +[NSURL _web_URLWithWTFString:relativeToURL:] in WKPDFView
     4        https://bugs.webkit.org/show_bug.cgi?id=138357
     5
     6        Rubber-stamped by Dan Bernstein.
     7
     8        During patch review for r175595 I changed from using +URLWithString:relativeToURL: to using
     9        +_web_URLWithWTFString:relativeToURL: to append a page number fragment to the document URL.
     10        If the base URL already contains a fragment, +_web_URLWithWTFString:relativeToURL: appends to the existing
     11        fragment whereas +URLWithString:relativeToURL: replaces the existing fragment. I want the latter behavior.
     12
     13        * UIProcess/ios/WKPDFView.mm:
     14        (-[WKPDFView _URLForLinkAnnotation:]):
     15
    1162014-11-04  Tim Horton  <timothy_horton@apple.com>
    217
  • trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm

    r175595 r175607  
    3131#import "APIUIClient.h"
    3232#import "SessionState.h"
    33 #import "WKNSURLExtras.h"
    3433#import "WKPDFPageNumberIndicator.h"
    3534#import "WKWebViewInternal.h"
     
    359358        String anchorString = ASCIILiteral("#page");
    360359        anchorString.append(String::number(pageNumber));
    361         return [NSURL _web_URLWithWTFString:anchorString relativeToURL:documentURL];
     360        return [NSURL URLWithString:anchorString relativeToURL:documentURL];
    362361    }
    363362
Note: See TracChangeset for help on using the changeset viewer.