Diff
Modified: trunk/Source/WebCore/ChangeLog (100871 => 100872)
--- trunk/Source/WebCore/ChangeLog 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebCore/ChangeLog 2011-11-20 22:55:45 UTC (rev 100872)
@@ -1,3 +1,14 @@
+2011-11-17 Mark Rowe <[email protected]>
+
+ <http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
+ switch away from the deprecated APIs.
+
+ Reviewed by Sam Weinig.
+
+ * platform/mac/WebCoreNSStringExtras.mm:
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::reportErrorToClient):
+
2011-11-19 Kevin Ollivier <[email protected]>
[wx] C++ bindings build fix for move of array classes to WTF.
Modified: trunk/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm (100871 => 100872)
--- trunk/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm 2011-11-20 22:55:45 UTC (rev 100872)
@@ -68,6 +68,11 @@
return filename;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
CFStringEncoding stringEncodingForResource(Handle resource)
{
short resRef = HomeResFile(resource);
@@ -110,3 +115,6 @@
return encoding;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (100871 => 100872)
--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2011-11-20 22:55:45 UTC (rev 100872)
@@ -542,13 +542,24 @@
String description;
#if PLATFORM(MAC)
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
if (CFEqual(CFErrorGetDomain(error), kCFErrorDomainOSStatus)) {
const char* descriptionOSStatus = GetMacOSStatusCommentString(static_cast<OSStatus>(errorCode));
if (descriptionOSStatus && descriptionOSStatus[0] != '\0')
description = "OSStatus Error " + String::number(errorCode) + ": " + descriptionOSStatus;
}
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
#endif
+#endif
+
if (description.isNull()) {
RetainPtr<CFStringRef> descriptionCF(AdoptCF, CFErrorCopyDescription(error));
description = String(descriptionCF.get());
Modified: trunk/Source/WebKit/mac/ChangeLog (100871 => 100872)
--- trunk/Source/WebKit/mac/ChangeLog 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-11-20 22:55:45 UTC (rev 100872)
@@ -1,3 +1,14 @@
+2011-11-17 Mark Rowe <[email protected]>
+
+ <http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
+ switch away from the deprecated APIs.
+
+ Reviewed by Sam Weinig.
+
+ * Plugins/WebBasePluginPackage.mm:
+ * Plugins/WebNetscapePluginPackage.mm:
+ (-[WebNetscapePluginPackage _tryLoad]):
+
2011-11-18 Anton D'Auria <[email protected]>
bool WebChromeClient::shouldInterruptJavaScript casts pointer to bool and always returns true
Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (100871 => 100872)
--- trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2011-11-20 22:55:45 UTC (rev 100872)
@@ -93,6 +93,11 @@
return WebCFAutorelease(WKCopyCFLocalizationPreferredName(NULL));
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+// FIXME: Rewrite this in terms of -[NSURL URLByResolvingBookmarkData:…].
static NSString *pathByResolvingSymlinksAndAliases(NSString *thePath)
{
NSString *newPath = [thePath stringByResolvingSymlinksInPath];
@@ -118,6 +123,9 @@
return newPath;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
- (id)initWithPath:(NSString *)pluginPath
{
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm (100871 => 100872)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2011-11-20 22:55:45 UTC (rev 100872)
@@ -122,6 +122,11 @@
CFBundleCloseBundleResourceMap(cfBundle.get(), resRef);
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
- (NSString *)stringForStringListID:(SInt16)stringListID andIndex:(SInt16)index
{
// Get resource, and dereference the handle.
@@ -201,6 +206,9 @@
return YES;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
- (BOOL)_initWithPath:(NSString *)pluginPath
{
@@ -424,13 +432,20 @@
isCFM = YES;
}
#endif /* SUPPORT_CFM */
-
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
// Plugins (at least QT) require that you call UseResFile on the resource file before loading it.
resourceRef = [self openResourceFile];
if (resourceRef != -1) {
UseResFile(resourceRef);
}
-
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
// swap function tables
#ifdef SUPPORT_CFM
if (isCFM) {
Modified: trunk/Source/WebKit2/ChangeLog (100871 => 100872)
--- trunk/Source/WebKit2/ChangeLog 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-20 22:55:45 UTC (rev 100872)
@@ -1,3 +1,12 @@
+2011-11-17 Mark Rowe <[email protected]>
+
+ <http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
+ switch away from the deprecated APIs.
+
+ Reviewed by Sam Weinig.
+
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+
2011-11-19 Sheriff Bot <[email protected]>
Unreviewed, rolling out r100834.
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (100871 => 100872)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-11-20 16:40:40 UTC (rev 100871)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-11-20 22:55:45 UTC (rev 100872)
@@ -216,6 +216,11 @@
return true;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
class ResourceMap {
public:
explicit ResourceMap(CFBundleRef bundle)
@@ -284,6 +289,10 @@
return true;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
static const ResID PluginNameOrDescriptionStringNumber = 126;
static const ResID MIMEDescriptionStringNumber = 127;
static const ResID MIMEListStringStringNumber = 128;
