Commit 319ca883 authored by mrowe@apple.com's avatar mrowe@apple.com

<http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily

switch away from the deprecated APIs.

Reviewed by Sam Weinig.

Source/WebCore:

* platform/mac/WebCoreNSStringExtras.mm:
* platform/network/cf/SocketStreamHandleCFNet.cpp:
(WebCore::SocketStreamHandle::reportErrorToClient):

Source/WebKit/mac:

* Plugins/WebBasePluginPackage.mm:
* Plugins/WebNetscapePluginPackage.mm:
(-[WebNetscapePluginPackage _tryLoad]):

Source/WebKit2:

* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100872 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 313e2a05
2011-11-17 Mark Rowe <mrowe@apple.com>
<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 <kevino@theolliviers.com>
[wx] C++ bindings build fix for move of array classes to WTF.
......@@ -68,6 +68,11 @@ NSString *filenameByFixingIllegalCharacters(NSString *string)
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 @@ CFStringEncoding stringEncodingForResource(Handle resource)
return encoding;
}
#if COMPILER(CLANG)
#pragma clang diagnostic pop
#endif
......@@ -542,11 +542,22 @@ void SocketStreamHandle::reportErrorToClient(CFErrorRef error)
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()) {
......
2011-11-17 Mark Rowe <mrowe@apple.com>
<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 <adauria@apple.com>
bool WebChromeClient::shouldInterruptJavaScript casts pointer to bool and always returns true
......
......@@ -93,6 +93,11 @@ using namespace WebCore;
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 @@ static NSString *pathByResolvingSymlinksAndAliases(NSString *thePath)
return newPath;
}
#if COMPILER(CLANG)
#pragma clang diagnostic pop
#endif
- (id)initWithPath:(NSString *)pluginPath
{
......
......@@ -122,6 +122,11 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
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 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
return YES;
}
#if COMPILER(CLANG)
#pragma clang diagnostic pop
#endif
- (BOOL)_initWithPath:(NSString *)pluginPath
{
......@@ -424,13 +432,20 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
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) {
......
2011-11-17 Mark Rowe <mrowe@apple.com>
<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 <webkit.review.bot@gmail.com>
Unreviewed, rolling out r100834.
......
......@@ -216,6 +216,11 @@ static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginModuleInfo&
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 @@ static bool getStringListResource(ResID resourceID, Vector<String>& stringList)
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment