From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 4 Nov 2010 12:00:17 -0700
Subject: Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
---
 WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp')

diff --git a/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp b/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
index 6143c1e..d169bc4 100644
--- a/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
@@ -35,10 +35,10 @@ using namespace JSC;
 
 namespace WebCore {
 
-JSValue JSHTMLOptionsCollection::length(ExecState* exec) const
+JSValue JSHTMLOptionsCollection::length(ExecState*) const
 {
     HTMLOptionsCollection* imp = static_cast<HTMLOptionsCollection*>(impl());
-    return jsNumber(exec, imp->length());
+    return jsNumber(imp->length());
 }
 
 void JSHTMLOptionsCollection::setLength(ExecState* exec, JSValue value)
-- 
cgit v1.1