Diff
Modified: trunk/Source/WebCore/ChangeLog (142950 => 142951)
--- trunk/Source/WebCore/ChangeLog 2013-02-15 02:02:18 UTC (rev 142950)
+++ trunk/Source/WebCore/ChangeLog 2013-02-15 02:07:25 UTC (rev 142951)
@@ -1,3 +1,18 @@
+2013-02-14 Kentaro Hara <hara...@chromium.org>
+
+ Unreviewed. Rebaselined run-bindings-tests.
+
+ * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+ (WebDOMTestObj::anyAttribute):
+ (WebDOMTestObj::setAnyAttribute):
+ * bindings/scripts/test/CPP/WebDOMTestObj.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (webkit_dom_test_obj_get_any_attribute):
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::jsTestTypedefsPrototypeFunctionFuncWithClamp):
+ * bindings/scripts/test/V8/V8TestTypedefs.cpp:
+ (WebCore::TestTypedefsV8Internal::funcWithClampCallback):
+
2013-02-14 Christian Biesinger <cbiesin...@chromium.org>
Convert media controls from DeprecatedFlexibleBox to FlexibleBox
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp (142950 => 142951)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2013-02-15 02:02:18 UTC (rev 142950)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2013-02-15 02:07:25 UTC (rev 142951)
@@ -31,11 +31,11 @@
#include "WebDOMDictionary.h"
#include "WebDOMDocument.h"
#include "WebDOMNode.h"
+#include "WebDOMObject.h"
#include "WebDOMSVGPoint.h"
#include "WebDOMString.h"
#include "WebDOMTestObj.h"
#include "WebDOMa.h"
-#include "WebDOMany.h"
#include "WebDOMb.h"
#include "WebDOMbool.h"
#include "WebDOMd.h"
@@ -43,7 +43,6 @@
#include "WebExceptionHandler.h"
#include "WebNativeEventListener.h"
#include "a.h"
-#include "any.h"
#include "b.h"
#include "bool.h"
#include "d.h"
@@ -537,15 +536,15 @@
}
#endif
-WebDOMany WebDOMTestObj::anyAttribute() const
+WebDOMObject WebDOMTestObj::anyAttribute() const
{
if (!impl())
- return WebDOMany();
+ return WebDOMObject();
return toWebKit(WTF::getPtr(impl()->anyAttribute()));
}
-void WebDOMTestObj::setAnyAttribute(const WebDOMany& newAnyAttribute)
+void WebDOMTestObj::setAnyAttribute(const WebDOMObject& newAnyAttribute)
{
if (!impl())
return;
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h (142950 => 142951)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2013-02-15 02:02:18 UTC (rev 142950)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2013-02-15 02:07:25 UTC (rev 142951)
@@ -34,11 +34,11 @@
class WebDOMDocument;
class WebDOMEventListener;
class WebDOMNode;
+class WebDOMObject;
class WebDOMSVGPoint;
class WebDOMString;
class WebDOMTestObj;
class WebDOMa;
-class WebDOMany;
class WebDOMb;
class WebDOMbool;
class WebDOMd;
@@ -129,8 +129,8 @@
int conditionalAttr3() const;
void setConditionalAttr3(int);
#endif
- WebDOMany anyAttribute() const;
- void setAnyAttribute(const WebDOMany&);
+ WebDOMObject anyAttribute() const;
+ void setAnyAttribute(const WebDOMObject&);
WebDOMDocument contentDocument() const;
WebDOMSVGPoint mutablePoint() const;
void setMutablePoint(const WebDOMSVGPoint&);
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (142950 => 142951)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2013-02-15 02:02:18 UTC (rev 142950)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2013-02-15 02:07:25 UTC (rev 142951)
@@ -33,7 +33,6 @@
#include "WebKitDOMSerializedScriptValuePrivate.h"
#include "WebKitDOMTestObjPrivate.h"
#include "WebKitDOMaPrivate.h"
-#include "WebKitDOManyPrivate.h"
#include "WebKitDOMbPrivate.h"
#include "WebKitDOMboolPrivate.h"
#include "WebKitDOMdPrivate.h"
@@ -2150,7 +2149,7 @@
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), 0);
WebCore::TestObj* item = WebKit::core(self);
RefPtr<WebCore::any> gobjectResult = WTF::getPtr(item->anyAttribute());
- return WebKit::kit(gobjectResult.get());
+ return 0; // TODO: return canvas object
}
void
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (142950 => 142951)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2013-02-15 02:02:18 UTC (rev 142950)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2013-02-15 02:07:25 UTC (rev 142951)
@@ -496,7 +496,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- if (!isnan(arg1NativeValue))
+ if (!std::isnan(arg1NativeValue))
arg1 = clampTo<unsigned long long>(arg1NativeValue);
@@ -511,7 +511,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- if (!isnan(arg2NativeValue))
+ if (!std::isnan(arg2NativeValue))
arg2 = clampTo<unsigned long long>(arg2NativeValue);
impl->funcWithClamp(arg1, arg2);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.cpp (142950 => 142951)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.cpp 2013-02-15 02:02:18 UTC (rev 142950)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.cpp 2013-02-15 02:07:25 UTC (rev 142951)
@@ -286,7 +286,7 @@
TestTypedefs* imp = V8TestTypedefs::toNative(args.Holder());
unsigned long long arg1 = 0;
V8TRYCATCH(double, arg1NativeValue, args[0]->NumberValue());
- if (!isnan(arg1NativeValue))
+ if (!std::isnan(arg1NativeValue))
arg1 = clampTo<unsigned long long>(arg1NativeValue);
if (args.Length() <= 1) {
imp->funcWithClamp(arg1);
@@ -294,7 +294,7 @@
}
unsigned long long arg2 = 0;
V8TRYCATCH(double, arg2NativeValue, args[1]->NumberValue());
- if (!isnan(arg2NativeValue))
+ if (!std::isnan(arg2NativeValue))
arg2 = clampTo<unsigned long long>(arg2NativeValue);
imp->funcWithClamp(arg1, arg2);
return v8Undefined();
