Changeset 98386 in webkit

Timestamp:

Oct 25, 2011, 1:38:25 PM (15 years ago)

Author:

weinig@apple.com

Message:

Make loadFileURL:restrictToFilesWithin: work, albeit, without the correct
restrictions for now.

Reviewed by Anders Carlsson.

• UIProcess/API/mac/WKBrowsingContextController.mm:

(-[WKBrowsingContextController loadFileURL:restrictToFilesWithin:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKBrowsingContextController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-25  Sam Weinig  <sam@webkit.org>
+
+        Make loadFileURL:restrictToFilesWithin: work, albeit, without the correct
+        restrictions for now.
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKBrowsingContextController.mm:
+        (-[WKBrowsingContextController loadFileURL:restrictToFilesWithin:]):
+
 2011-10-25  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm

@@ -100 +100 @@
 - (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory
 {
-    /* FIXME: Implement. */
+    if (![URL isFileURL])
+        return;
+
+    /* FIXME: Implement restrictions. */
+
+    WKRetainPtr<WKURLRef> wkURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)URL));
+    WKPageLoadURL(self.pageRef, wkURL.get());
 }