[webkit-changes] [102852] tags/Safari-535.13.1/Source/WebCore

Wed, 14 Dec 2011 17:15:10 -0800

Title: [102852] tags/Safari-535.13.1/Source/WebCore

Diff

Modified: tags/Safari-535.13.1/Source/WebCore/ChangeLog (102851 => 102852)


--- tags/Safari-535.13.1/Source/WebCore/ChangeLog	2011-12-15 01:08:34 UTC (rev 102851)
+++ tags/Safari-535.13.1/Source/WebCore/ChangeLog	2011-12-15 01:15:02 UTC (rev 102852)
@@ -1,3 +1,17 @@
+2011-12-14  Lucas Forschler  <[email protected]>
+
+    Merge 102691
+
+    2011-12-13  Brady Eidson  <[email protected]>
+
+            <http://webkit.org/b/74420> Disable deprecation warnings around more code where we 
+            cannot easily switch away from the deprecated APIs.
+
+            Reviewed by Mark Rowe.
+
+            * bindings/objc/DOMInternal.mm:
+            * bridge/objc/objc_instance.mm:
+
 2011-12-12  Ryosuke Niwa  <[email protected]>
 
         WebKit code shouldn't be calling applyCommand directly

Modified: tags/Safari-535.13.1/Source/WebCore/bindings/objc/DOMInternal.mm (102851 => 102852)


--- tags/Safari-535.13.1/Source/WebCore/bindings/objc/DOMInternal.mm	2011-12-15 01:08:34 UTC (rev 102851)
+++ tags/Safari-535.13.1/Source/WebCore/bindings/objc/DOMInternal.mm	2011-12-15 01:15:02 UTC (rev 102852)
@@ -37,6 +37,11 @@
 
 static NSMapTable* DOMWrapperCache;
 
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif    
+
 NSMapTable* createWrapperCache()
 {
     // NSMapTable with zeroing weak pointers is the recommended way to build caches like this under garbage collection.
@@ -45,6 +50,10 @@
     return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
 }
 
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
 NSObject* getDOMWrapper(DOMObjectInternal* impl)
 {
     if (!DOMWrapperCache)

Modified: tags/Safari-535.13.1/Source/WebCore/bridge/objc/objc_instance.mm (102851 => 102852)


--- tags/Safari-535.13.1/Source/WebCore/bridge/objc/objc_instance.mm	2011-12-15 01:08:34 UTC (rev 102851)
+++ tags/Safari-535.13.1/Source/WebCore/bridge/objc/objc_instance.mm	2011-12-15 01:15:02 UTC (rev 102852)
@@ -53,6 +53,11 @@
 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()
 {
     // NSMapTable with zeroing weak pointers is the recommended way to build caches like this under garbage collection.
@@ -61,6 +66,10 @@
     return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
 }
 
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
 RuntimeObject* ObjcInstance::newRuntimeObject(ExecState* exec)
 {
     return ObjCRuntimeObject::create(exec, exec->lexicalGlobalObject(), this);

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to