Changeset 100872 in webkit


Ignore:
Timestamp:
Nov 20, 2011 2:55:45 PM (12 years ago)
Author:
mrowe@apple.com
Message:

<​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:
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r100867 r100872  
     12011-11-17  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
     4        switch away from the deprecated APIs.
     5
     6        Reviewed by Sam Weinig.
     7
     8        * platform/mac/WebCoreNSStringExtras.mm:
     9        * platform/network/cf/SocketStreamHandleCFNet.cpp:
     10        (WebCore::SocketStreamHandle::reportErrorToClient):
     11
    1122011-11-19  Kevin Ollivier  <kevino@theolliviers.com>
    213

  • trunk/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm

    r100703 r100872  
    6969}
    7070
     71#if COMPILER(CLANG)
     72#pragma clang diagnostic push
     73#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     74#endif
     75
    7176CFStringEncoding stringEncodingForResource(Handle resource)
    7277{
    … …  
    111116}
    112117
     118#if COMPILER(CLANG)
     119#pragma clang diagnostic pop
     120#endif

  • trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp

    r100703 r100872  
    543543
    544544#if PLATFORM(MAC)
     545
     546#if COMPILER(CLANG)
     547#pragma clang diagnostic push
     548#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     549#endif
     550
    545551    if (CFEqual(CFErrorGetDomain(error), kCFErrorDomainOSStatus)) {
    546552        const char* descriptionOSStatus = GetMacOSStatusCommentString(static_cast<OSStatus>(errorCode));
    … …  
    548554            description = "OSStatus Error " + String::number(errorCode) + ": " + descriptionOSStatus;
    549555    }
     556
     557#if COMPILER(CLANG)
     558#pragma clang diagnostic pop
     559#endif
     560
    550561#endif
    551562

  • trunk/Source/WebKit/mac/ChangeLog

    r100792 r100872  
     12011-11-17  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
     4        switch away from the deprecated APIs.
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Plugins/WebBasePluginPackage.mm:
     9        * Plugins/WebNetscapePluginPackage.mm:
     10        (-[WebNetscapePluginPackage _tryLoad]):
     11
    1122011-11-18  Anton D'Auria  <adauria@apple.com>
    213

  • trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm

    r100703 r100872  
    9494}
    9595
     96#if COMPILER(CLANG)
     97#pragma clang diagnostic push
     98#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     99#endif
     100// FIXME: Rewrite this in terms of -[NSURL URLByResolvingBookmarkData:…].
    96101static NSString *pathByResolvingSymlinksAndAliases(NSString *thePath)
    97102{
    … …  
    119124    return newPath;
    120125}
     126#if COMPILER(CLANG)
     127#pragma clang diagnostic pop
     128#endif
    121129
    122130- (id)initWithPath:(NSString *)pluginPath

  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm

    r100703 r100872  
    123123}
    124124
     125#if COMPILER(CLANG)
     126#pragma clang diagnostic push
     127#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     128#endif
     129
    125130- (NSString *)stringForStringListID:(SInt16)stringListID andIndex:(SInt16)index
    126131{
    … …  
    202207    return YES;
    203208}
     209#if COMPILER(CLANG)
     210#pragma clang diagnostic pop
     211#endif
    204212
    205213- (BOOL)_initWithPath:(NSString *)pluginPath
    … …  
    425433    }
    426434#endif /* SUPPORT_CFM */
    427    
     435
     436#if COMPILER(CLANG)
     437#pragma clang diagnostic push
     438#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     439#endif
    428440    // Plugins (at least QT) require that you call UseResFile on the resource file before loading it.
    429441    resourceRef = [self openResourceFile];
    … …  
    431443        UseResFile(resourceRef);
    432444    }
    433    
     445#if COMPILER(CLANG)
     446#pragma clang diagnostic pop
     447#endif
     448
    434449    // swap function tables
    435450#ifdef SUPPORT_CFM

  • trunk/Source/WebKit2/ChangeLog

    r100859 r100872  
     12011-11-17  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
     4        switch away from the deprecated APIs.
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
     9
    1102011-11-19  Sheriff Bot  <webkit.review.bot@gmail.com>
    211

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

    r100703 r100872  
    217217}
    218218
     219#if COMPILER(CLANG)
     220#pragma clang diagnostic push
     221#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     222#endif
     223
    219224class ResourceMap {
    220225public:
    … …  
    285290}
    286291
     292#if COMPILER(CLANG)
     293#pragma clang diagnostic pop
     294#endif
     295
    287296static const ResID PluginNameOrDescriptionStringNumber = 126;
    288297static const ResID MIMEDescriptionStringNumber = 127;
Note: See TracChangeset for help on using the changeset viewer.