webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 20 insertions, 25 deletions

diff --git a/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp b/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp
index a82e7b8bc..f79a3341f 100644
--- a/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp
+++ b/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -35,43 +35,38 @@ using namespace JSC;
 
 namespace WebCore {
 
-void JSVideoTrack::visitChildren(JSCell* cell, SlotVisitor& visitor)
+void JSVideoTrack::visitAdditionalChildren(SlotVisitor& visitor)
 {
-    JSVideoTrack* jsVideoTrack = jsCast<JSVideoTrack*>(cell);
-    ASSERT_GC_OBJECT_INHERITS(jsVideoTrack, info());
-    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
-    ASSERT(jsVideoTrack->structure()->typeInfo().overridesVisitChildren());
-    Base::visitChildren(jsVideoTrack, visitor);
-
-    VideoTrack& videoTrack = jsVideoTrack->impl();
-    visitor.addOpaqueRoot(root(&videoTrack));
+    visitor.addOpaqueRoot(root(&wrapped()));
 }
 
-void JSVideoTrack::setKind(ExecState* exec, JSValue value)
+void JSVideoTrack::setKind(ExecState& state, JSValue value)
 {
-    UNUSED_PARAM(exec);
 #if ENABLE(MEDIA_SOURCE)
-    const String& nativeValue(value.isEmpty() ? String() : value.toString(exec)->value(exec));
-    if (exec->hadException())
-        return;
-    impl().setKind(nativeValue);
+    VM& vm = state.vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    auto string = value.toWTFString(&state);
+    RETURN_IF_EXCEPTION(scope, void());
+    wrapped().setKind(string);
 #else
+    UNUSED_PARAM(state);
     UNUSED_PARAM(value);
-    return;
 #endif
 }
 
-void JSVideoTrack::setLanguage(ExecState* exec, JSValue value)
+void JSVideoTrack::setLanguage(ExecState& state, JSValue value)
 {
-    UNUSED_PARAM(exec);
 #if ENABLE(MEDIA_SOURCE)
-    const String& nativeValue(value.isEmpty() ? String() : value.toString(exec)->value(exec));
-    if (exec->hadException())
-        return;
-    impl().setLanguage(nativeValue);
+    VM& vm = state.vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    auto string = value.toWTFString(&state);
+    RETURN_IF_EXCEPTION(scope, void());
+    wrapped().setLanguage(string);
 #else
+    UNUSED_PARAM(state);
     UNUSED_PARAM(value);
-    return;
 #endif
 }