From 832e8fa7a6b4e60631be1a7761c3003d245bfb9f Mon Sep 17 00:00:00 2001 From: "yurys@chromium.org" Date: Wed, 15 Feb 2012 14:05:04 +0000 Subject: [PATCH] 2012-02-15 Yury Semikhatsky Unreviewed. Build fix after r107806 * inspector/InjectedScript.cpp: (WebCore::InjectedScript::callFunctionWithEvalEnabled): * inspector/InjectedScript.h: (InjectedScript): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107808 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 9 +++++++++ Source/WebCore/inspector/InjectedScript.cpp | 2 +- Source/WebCore/inspector/InjectedScript.h | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 837e6ba..068abbc 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,14 @@ 2012-02-15 Yury Semikhatsky + Unreviewed. Build fix after r107806 + + * inspector/InjectedScript.cpp: + (WebCore::InjectedScript::callFunctionWithEvalEnabled): + * inspector/InjectedScript.h: + (InjectedScript): + +2012-02-15 Yury Semikhatsky + Web Inspector: crash when inspecting an element on a page with eval disabled by CSP https://bugs.webkit.org/show_bug.cgi?id=78705 diff --git a/Source/WebCore/inspector/InjectedScript.cpp b/Source/WebCore/inspector/InjectedScript.cpp index 7bb62bc..47e09c7 100644 --- a/Source/WebCore/inspector/InjectedScript.cpp +++ b/Source/WebCore/inspector/InjectedScript.cpp @@ -208,7 +208,7 @@ bool InjectedScript::canAccessInspectedWindow() const return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState()); } -ScriptValue InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) +ScriptValue InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const { DOMWindow* domWindow = domWindowFromScriptState(m_injectedScriptObject.scriptState()); InspectorInstrumentationCookie cookie = domWindow && domWindow->frame() ? InspectorInstrumentation::willCallFunction(domWindow->frame()->page(), "InjectedScript", 1) : InspectorInstrumentationCookie(); diff --git a/Source/WebCore/inspector/InjectedScript.h b/Source/WebCore/inspector/InjectedScript.h index 6cc20d9..3b58031 100644 --- a/Source/WebCore/inspector/InjectedScript.h +++ b/Source/WebCore/inspector/InjectedScript.h @@ -100,7 +100,7 @@ private: InjectedScript(ScriptObject, InspectedStateAccessCheck); bool canAccessInspectedWindow() const; - ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException); + ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const; void makeCall(ScriptFunctionCall&, RefPtr* result); void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr* result, bool* wasThrown); ScriptValue nodeAsScriptValue(Node*); -- 2.7.4