Title: [125235] trunk
- Revision
- 125235
- Author
- [email protected]
- Date
- 2012-08-09 19:11:58 -0700 (Thu, 09 Aug 2012)
Log Message
http/tests/security/mixedContent/blob-url-in-iframe.html fails on Mac
https://bugs.webkit.org/show_bug.cgi?id=88736
Reviewed by Alexey Proskuryakov.
Source/WebKit/mac:
WebView::_canHandleRequest should return true for "blob:" URL so that it can be shown in iframe.
* WebView/WebView.mm:
(+[WebView _canHandleRequest:forMainFrame:]):
LayoutTests:
Remove security/mixedContent/blob-url-in-iframe.html as it should pass with this patch.
* platform/mac/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (125234 => 125235)
--- trunk/LayoutTests/ChangeLog 2012-08-10 02:04:47 UTC (rev 125234)
+++ trunk/LayoutTests/ChangeLog 2012-08-10 02:11:58 UTC (rev 125235)
@@ -1,3 +1,14 @@
+2012-08-09 Kinuko Yasuda <[email protected]>
+
+ http/tests/security/mixedContent/blob-url-in-iframe.html fails on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=88736
+
+ Reviewed by Alexey Proskuryakov.
+
+ Remove security/mixedContent/blob-url-in-iframe.html as it should pass with this patch.
+
+ * platform/mac/Skipped:
+
2012-08-09 Julien Chaffraix <[email protected]>
Crash in WebCore::RenderTable::cellBefore
Modified: trunk/LayoutTests/platform/mac/Skipped (125234 => 125235)
--- trunk/LayoutTests/platform/mac/Skipped 2012-08-10 02:04:47 UTC (rev 125234)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-08-10 02:11:58 UTC (rev 125235)
@@ -905,9 +905,6 @@
svg/filters/container-with-filters.svg
svg/filters/feSpecularLight-premultiplied.svg
-# https://bugs.webkit.org/show_bug.cgi?id=88736
-http/tests/security/mixedContent/blob-url-in-iframe.html
-
# https://bugs.webkit.org/show_bug.cgi?id=89680
fast/canvas/canvas-imageSmoothingEnabled-repaint.html
Modified: trunk/Source/WebKit/mac/ChangeLog (125234 => 125235)
--- trunk/Source/WebKit/mac/ChangeLog 2012-08-10 02:04:47 UTC (rev 125234)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-08-10 02:11:58 UTC (rev 125235)
@@ -1,3 +1,15 @@
+2012-08-09 Kinuko Yasuda <[email protected]>
+
+ http/tests/security/mixedContent/blob-url-in-iframe.html fails on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=88736
+
+ Reviewed by Alexey Proskuryakov.
+
+ WebView::_canHandleRequest should return true for "blob:" URL so that it can be shown in iframe.
+
+ * WebView/WebView.mm:
+ (+[WebView _canHandleRequest:forMainFrame:]):
+
2012-08-08 Shane Stephens <[email protected]>
Compile flag for CSS Hierarchies
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (125234 => 125235)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-08-10 02:04:47 UTC (rev 125234)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-08-10 02:11:58 UTC (rev 125235)
@@ -1760,8 +1760,16 @@
// Representations for URL schemes work at the top level.
if (forMainFrame && [self _representationExistsForURLScheme:scheme])
return YES;
-
- return [scheme _webkit_isCaseInsensitiveEqualToString:@"applewebdata"];
+
+ if ([scheme _webkit_isCaseInsensitiveEqualToString:@"applewebdata"])
+ return YES;
+
+#if ENABLE(BLOB)
+ if ([scheme _webkit_isCaseInsensitiveEqualToString:@"blob"])
+ return YES;
+#endif
+
+ return NO;
}
+ (BOOL)_canHandleRequest:(NSURLRequest *)request
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
