Title: [189414] trunk/Source
- Revision
- 189414
- Author
- [email protected]
- Date
- 2015-09-04 19:30:48 -0700 (Fri, 04 Sep 2015)
Log Message
Remove unnecessary compiler guards from mm files
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (189413 => 189414)
--- trunk/Source/WebCore/ChangeLog 2015-09-05 01:23:03 UTC (rev 189413)
+++ trunk/Source/WebCore/ChangeLog 2015-09-05 02:30:48 UTC (rev 189414)
@@ -1,3 +1,13 @@
+2015-09-04 Csaba Osztrogonác <[email protected]>
+
+ 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 <[email protected]>
[mediacontrols] Test AirPlay picker button
Modified: trunk/Source/WebCore/bindings/objc/DOMInternal.mm (189413 => 189414)
--- trunk/Source/WebCore/bindings/objc/DOMInternal.mm 2015-09-05 01:23:03 UTC (rev 189413)
+++ trunk/Source/WebCore/bindings/objc/DOMInternal.mm 2015-09-05 02:30:48 UTC (rev 189414)
@@ -50,10 +50,8 @@
static StaticLock wrapperCacheLock;
#endif
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
NSMapTable* createWrapperCache()
{
@@ -63,9 +61,7 @@
return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
}
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
NSObject* getDOMWrapper(DOMObjectInternal* impl)
{
Modified: trunk/Source/WebCore/bridge/objc/objc_instance.mm (189413 => 189414)
--- trunk/Source/WebCore/bridge/objc/objc_instance.mm 2015-09-05 01:23:03 UTC (rev 189413)
+++ trunk/Source/WebCore/bridge/objc/objc_instance.mm 2015-09-05 02:30:48 UTC (rev 189414)
@@ -56,10 +56,8 @@
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 @@
return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
}
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
RuntimeObject* ObjcInstance::newRuntimeObject(ExecState* exec)
{
Modified: trunk/Source/WebKit/mac/ChangeLog (189413 => 189414)
--- trunk/Source/WebKit/mac/ChangeLog 2015-09-05 01:23:03 UTC (rev 189413)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-09-05 02:30:48 UTC (rev 189414)
@@ -1,3 +1,13 @@
+2015-09-04 Csaba Osztrogonác <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: InspectorController should support multiple frontend channels
Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (189413 => 189414)
--- trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2015-09-05 01:23:03 UTC (rev 189413)
+++ trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2015-09-05 02:30:48 UTC (rev 189414)
@@ -88,10 +88,8 @@
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 @@
return newPath;
}
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
- (id)initWithPath:(NSString *)pluginPath
{
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm (189413 => 189414)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2015-09-05 01:23:03 UTC (rev 189413)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2015-09-05 02:30:48 UTC (rev 189414)
@@ -168,18 +168,14 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes