Changeset 162927 in webkit

Timestamp:

Jan 28, 2014, 2:02:21 AM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r162885.

Location:

tags/Safari-538.14/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/test/ObjC/DOMTestInterface.h (modified) (2 diffs)
• bindings/scripts/test/ObjC/DOMTestObj.h (modified) (2 diffs)

tags/Safari-538.14/Source/WebCore/ChangeLog

@@ -1 +1 @@
 2014-01-28  Babak Shafiei  <bshafiei@apple.com>
 
+        Merge r162885
+
+    2014-01-27  Andy Estes  <aestes@apple.com>
+
+            Update bindings test expectations after r162872
+
+            * bindings/scripts/test/ObjC/DOMTestInterface.h:
+            * bindings/scripts/test/ObjC/DOMTestObj.h:
+
+2014-01-28  Babak Shafiei  <bshafiei@apple.com>
+
         Merge r162881
-
+        
     2014-01-27  Andy Estes  <aestes@apple.com>
 

tags/Safari-538.14/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.h

@@ -32 +32 @@
 
 enum {
-#if ENABLE(Condition22) || ENABLE(Condition23)
-    DOM_IMPLEMENTSCONSTANT1 = 1,
-#endif
-#if ENABLE(Condition22) || ENABLE(Condition23)
-    DOM_IMPLEMENTSCONSTANT2 = 2,
-#endif
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    DOM_SUPPLEMENTALCONSTANT1 = 1,
-#endif
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    DOM_SUPPLEMENTALCONSTANT2 = 2
-#endif
 
 } WEBKIT_ENUM_AVAILABLE_MAC(TBD);
@@ -57 +45 @@
 @property (copy) NSString *supplementalStr3;
 @property (strong) DOMNode *supplementalNode;
-
-#if ENABLE(Condition22) || ENABLE(Condition23)
-- (void)implementsMethod1;
-#endif
-#if ENABLE(Condition22) || ENABLE(Condition23)
-- (DOMTestObj *)implementsMethod2:(NSString *)strArg objArg:(DOMTestObj *)objArg;
-#endif
-#if ENABLE(Condition22) || ENABLE(Condition23)
-- (void)implementsMethod3;
-#endif
-#if ENABLE(Condition22) || ENABLE(Condition23)
-- (void)implementsMethod4;
-#endif
-#if ENABLE(Condition11) || ENABLE(Condition12)
-- (void)supplementalMethod1;
-#endif
-#if ENABLE(Condition11) || ENABLE(Condition12)
-- (DOMTestObj *)supplementalMethod2:(NSString *)strArg objArg:(DOMTestObj *)objArg;
-#endif
-#if ENABLE(Condition11) || ENABLE(Condition12)
-- (void)supplementalMethod3;
-#endif
-#if ENABLE(Condition11) || ENABLE(Condition12)
-- (void)supplementalMethod4;
-#endif
 @end

tags/Safari-538.14/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h

@@ -45 +45 @@
 
 enum {
-#if ENABLE(Condition1)
-    DOM_CONDITIONAL_CONST = 0,
-#endif
     DOM_CONST_VALUE_0 = 0,
     DOM_CONST_VALUE_1 = 1,
@@ -160 +157 @@
 - (void)methodWithOptionalStringIsUndefined:(NSString *)str;
 - (void)methodWithOptionalStringIsNullString:(NSString *)str;
-#if ENABLE(Condition1)
-- (NSString *)conditionalMethod1;
-#endif
-#if ENABLE(Condition1) && ENABLE(Condition2)
-- (void)conditionalMethod2;
-#endif
-#if ENABLE(Condition1) || ENABLE(Condition2)
-- (void)conditionalMethod3;
-#endif
 - (void)classMethod;
 - (int)classMethodWithOptional:(int)arg;
 - (void)classMethod2:(int)arg;
-#if ENABLE(Condition1)
-- (void)overloadedMethod1:(int)arg;
-#endif
-#if ENABLE(Condition1)
-- (void)overloadedMethod1:(NSString *)type;
-#endif
 - (DOMSVGDocument *)getSVGDocument;
 - (void)convert1:(DOMTestNode *)value;