Title: [98386] trunk/Source/WebKit2
- Revision
- 98386
- Author
- [email protected]
- Date
- 2011-10-25 13:38:25 -0700 (Tue, 25 Oct 2011)
Log Message
Make loadFileURL:restrictToFilesWithin: work, albeit, without the correct
restrictions for now.
Reviewed by Anders Carlsson.
* UIProcess/API/mac/WKBrowsingContextController.mm:
(-[WKBrowsingContextController loadFileURL:restrictToFilesWithin:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98385 => 98386)
--- trunk/Source/WebKit2/ChangeLog 2011-10-25 20:36:54 UTC (rev 98385)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-25 20:38:25 UTC (rev 98386)
@@ -1,3 +1,13 @@
+2011-10-25 Sam Weinig <[email protected]>
+
+ 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 <[email protected]>
PDF SUBFRAMES: Incomplete repaint after pinch to zoom
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (98385 => 98386)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2011-10-25 20:36:54 UTC (rev 98385)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2011-10-25 20:38:25 UTC (rev 98386)
@@ -99,7 +99,13 @@
- (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());
}
- (void)stopLoading
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
