From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 13 May 2011 16:23:25 +0100
Subject: Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
---
 Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp')

diff --git a/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp b/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
index 81ad955..6bd5abb 100644
--- a/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
@@ -241,8 +241,7 @@ InjectedScript InjectedScriptHost::injectedScriptFor(ScriptState* inspectedScrip
     if (!canAccessInspectedWindow(inspectedScriptState))
         return InjectedScript();
 
-    ASSERT(!m_injectedScriptSource.isEmpty());
-    pair<long, ScriptObject> injectedScript = injectScript(m_injectedScriptSource, inspectedScriptState);
+    pair<long, ScriptObject> injectedScript = injectScript(injectedScriptSource(), inspectedScriptState);
     InjectedScript result(injectedScript.second);
     m_idToInjectedScript.set(injectedScript.first, result);
     global->SetHiddenValue(key, injectedScript.second.v8Object());
-- 
cgit v1.1