Title: [143260] tags/Safari-537.31.3/Source
- Revision
- 143260
- Author
- [email protected]
- Date
- 2013-02-18 13:44:10 -0800 (Mon, 18 Feb 2013)
Log Message
Merge <rdar://problem/12968169>
Modified Paths
Diff
Modified: tags/Safari-537.31.3/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (143259 => 143260)
--- tags/Safari-537.31.3/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2013-02-18 21:37:54 UTC (rev 143259)
+++ tags/Safari-537.31.3/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2013-02-18 21:44:10 UTC (rev 143260)
@@ -33,7 +33,7 @@
ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
ENABLE_ACCELERATED_2D_CANVAS = ;
-ENABLE_BLOB = ENABLE_BLOB;
+ENABLE_BLOB = ;
ENABLE_CANVAS_PATH = ;
ENABLE_CANVAS_PROXY = ;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
Modified: tags/Safari-537.31.3/Source/WebCore/Configurations/FeatureDefines.xcconfig (143259 => 143260)
--- tags/Safari-537.31.3/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-02-18 21:37:54 UTC (rev 143259)
+++ tags/Safari-537.31.3/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-02-18 21:44:10 UTC (rev 143260)
@@ -33,7 +33,7 @@
ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
ENABLE_ACCELERATED_2D_CANVAS = ;
-ENABLE_BLOB = ENABLE_BLOB;
+ENABLE_BLOB = ;
ENABLE_CANVAS_PATH = ;
ENABLE_CANVAS_PROXY = ;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
Modified: tags/Safari-537.31.3/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp (143259 => 143260)
--- tags/Safari-537.31.3/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2013-02-18 21:37:54 UTC (rev 143259)
+++ tags/Safari-537.31.3/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2013-02-18 21:44:10 UTC (rev 143260)
@@ -155,7 +155,7 @@
{
}
-PassRefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const KURL& url)
+PassRefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const KURL&)
{
return 0;
}
Modified: tags/Safari-537.31.3/Source/WebCore/page/SecurityOrigin.cpp (143259 => 143260)
--- tags/Safari-537.31.3/Source/WebCore/page/SecurityOrigin.cpp 2013-02-18 21:37:54 UTC (rev 143259)
+++ tags/Safari-537.31.3/Source/WebCore/page/SecurityOrigin.cpp 2013-02-18 21:44:10 UTC (rev 143260)
@@ -84,6 +84,8 @@
#if ENABLE(BLOB)
if (url.protocolIs("blob"))
return ThreadableBlobRegistry::getCachedOrigin(url);
+#else
+ UNUSED_PARAM(url);
#endif
return 0;
}
Modified: tags/Safari-537.31.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (143259 => 143260)
--- tags/Safari-537.31.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2013-02-18 21:37:54 UTC (rev 143259)
+++ tags/Safari-537.31.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2013-02-18 21:44:10 UTC (rev 143260)
@@ -33,7 +33,7 @@
ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
ENABLE_ACCELERATED_2D_CANVAS = ;
-ENABLE_BLOB = ENABLE_BLOB;
+ENABLE_BLOB = ;
ENABLE_CANVAS_PATH = ;
ENABLE_CANVAS_PROXY = ;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
Modified: tags/Safari-537.31.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig (143259 => 143260)
--- tags/Safari-537.31.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2013-02-18 21:37:54 UTC (rev 143259)
+++ tags/Safari-537.31.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2013-02-18 21:44:10 UTC (rev 143260)
@@ -33,7 +33,7 @@
ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
ENABLE_ACCELERATED_2D_CANVAS = ;
-ENABLE_BLOB = ENABLE_BLOB;
+ENABLE_BLOB = ;
ENABLE_CANVAS_PATH = ;
ENABLE_CANVAS_PROXY = ;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
