Title: [107808] trunk/Source/WebCore
- Revision
- 107808
- Author
- [email protected]
- Date
- 2012-02-15 06:05:04 -0800 (Wed, 15 Feb 2012)
Log Message
2012-02-15 Yury Semikhatsky <[email protected]>
Unreviewed. Build fix after r107806
* inspector/InjectedScript.cpp:
(WebCore::InjectedScript::callFunctionWithEvalEnabled):
* inspector/InjectedScript.h:
(InjectedScript):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107807 => 107808)
--- trunk/Source/WebCore/ChangeLog 2012-02-15 13:59:55 UTC (rev 107807)
+++ trunk/Source/WebCore/ChangeLog 2012-02-15 14:05:04 UTC (rev 107808)
@@ -1,5 +1,14 @@
2012-02-15 Yury Semikhatsky <[email protected]>
+ Unreviewed. Build fix after r107806
+
+ * inspector/InjectedScript.cpp:
+ (WebCore::InjectedScript::callFunctionWithEvalEnabled):
+ * inspector/InjectedScript.h:
+ (InjectedScript):
+
+2012-02-15 Yury Semikhatsky <[email protected]>
+
Web Inspector: crash when inspecting an element on a page with eval disabled by CSP
https://bugs.webkit.org/show_bug.cgi?id=78705
Modified: trunk/Source/WebCore/inspector/InjectedScript.cpp (107807 => 107808)
--- trunk/Source/WebCore/inspector/InjectedScript.cpp 2012-02-15 13:59:55 UTC (rev 107807)
+++ trunk/Source/WebCore/inspector/InjectedScript.cpp 2012-02-15 14:05:04 UTC (rev 107808)
@@ -208,7 +208,7 @@
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();
Modified: trunk/Source/WebCore/inspector/InjectedScript.h (107807 => 107808)
--- trunk/Source/WebCore/inspector/InjectedScript.h 2012-02-15 13:59:55 UTC (rev 107807)
+++ trunk/Source/WebCore/inspector/InjectedScript.h 2012-02-15 14:05:04 UTC (rev 107808)
@@ -100,7 +100,7 @@
InjectedScript(ScriptObject, InspectedStateAccessCheck);
bool canAccessInspectedWindow() const;
- ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException);
+ ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
void makeCall(ScriptFunctionCall&, RefPtr<InspectorValue>* result);
void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<InspectorObject>* result, bool* wasThrown);
ScriptValue nodeAsScriptValue(Node*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
