Remove unnecessary compiler guards from mm files
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 5 Sep 2015 02:30:48 +0000 (02:30 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 5 Sep 2015 02:30:48 +0000 (02:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148797

Reviewed by Dan Bernstein.

Source/WebCore:

* bindings/objc/DOMInternal.mm:
* bridge/objc/objc_instance.mm:

Source/WebKit/mac:

* Plugins/WebBasePluginPackage.mm:
* Plugins/WebNetscapePluginPackage.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189414 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/bindings/objc/DOMInternal.mm
Source/WebCore/bridge/objc/objc_instance.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/WebBasePluginPackage.mm
Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm

index a6cadb2..73ae285 100644 (file)
@@ -1,3 +1,13 @@
+2015-09-04  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Remove unnecessary compiler guards from mm files
+        https://bugs.webkit.org/show_bug.cgi?id=148797
+
+        Reviewed by Dan Bernstein.
+
+        * bindings/objc/DOMInternal.mm:
+        * bridge/objc/objc_instance.mm:
+
 2015-09-04  Eric Carlson  <eric.carlson@apple.com>
 
         [mediacontrols] Test AirPlay picker button
index 91fe8e7..2a49bf7 100644 (file)
@@ -50,10 +50,8 @@ static NSMapTable* DOMWrapperCache;
 static StaticLock wrapperCacheLock;
 #endif
 
-#if COMPILER(CLANG)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif    
 
 NSMapTable* createWrapperCache()
 {
@@ -63,9 +61,7 @@ NSMapTable* createWrapperCache()
     return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
 }
 
-#if COMPILER(CLANG)
 #pragma clang diagnostic pop
-#endif
 
 NSObject* getDOMWrapper(DOMObjectInternal* impl)
 {
index 60bbe11..252d570 100644 (file)
@@ -56,10 +56,8 @@ static NSString *s_exception;
 static JSGlobalObject* s_exceptionEnvironment; // No need to protect this value, since we just use it for a pointer comparison.
 static NSMapTable *s_instanceWrapperCache;
 
-#if COMPILER(CLANG)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif    
 
 static NSMapTable *createInstanceWrapperCache()
 {
@@ -69,9 +67,7 @@ static NSMapTable *createInstanceWrapperCache()
     return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
 }
 
-#if COMPILER(CLANG)
 #pragma clang diagnostic pop
-#endif
 
 RuntimeObject* ObjcInstance::newRuntimeObject(ExecState* exec)
 {
index e3fc5aa..72b9aed 100644 (file)
@@ -1,3 +1,13 @@
+2015-09-04  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Remove unnecessary compiler guards from mm files
+        https://bugs.webkit.org/show_bug.cgi?id=148797
+
+        Reviewed by Dan Bernstein.
+
+        * Plugins/WebBasePluginPackage.mm:
+        * Plugins/WebNetscapePluginPackage.mm:
+
 2015-09-04  Brian Burg  <bburg@apple.com>
 
         Web Inspector: InspectorController should support multiple frontend channels
index 8685393..814f085 100644 (file)
@@ -88,10 +88,8 @@ using namespace WebCore;
     return [pluginPackage autorelease];
 }
 
-#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)
 {
@@ -120,9 +118,7 @@ static NSString *pathByResolvingSymlinksAndAliases(NSString *thePath)
 
     return newPath;
 }
-#if COMPILER(CLANG)
 #pragma clang diagnostic pop
-#endif
 
 - (id)initWithPath:(NSString *)pluginPath
 {
index 74bc3a2..f6213f3 100644 (file)
@@ -168,18 +168,14 @@ using namespace WebCore;
     if (!NP_Initialize || !NP_GetEntryPoints || !NP_Shutdown)
         return NO;
 
-#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
 
     browserFuncs.version = NP_VERSION_MINOR;
     browserFuncs.size = sizeof(NPNetscapeFuncs);