From db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 4 Aug 2010 11:41:34 +0100 Subject: Merge WebKit at r64523 : Initial merge by git. Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4 --- WebCore/plugins/PluginViewBase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/plugins') diff --git a/WebCore/plugins/PluginViewBase.h b/WebCore/plugins/PluginViewBase.h index 3c43c00..4e5fe1a 100644 --- a/WebCore/plugins/PluginViewBase.h +++ b/WebCore/plugins/PluginViewBase.h @@ -44,7 +44,7 @@ public: virtual PlatformLayer* platformLayer() const { return 0; } #endif - virtual JSC::JSObject* scriptObject(JSC::ExecState*, JSC::JSGlobalObject*) { return 0; } + virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*) { return 0; } protected: PluginViewBase(PlatformWidget widget) : Widget(widget) { } -- cgit v1.1