Title: [148345] branches/safari-536.30-branch/Source/WebCore
- Revision
- 148345
- Author
- [email protected]
- Date
- 2013-04-12 21:23:45 -0700 (Fri, 12 Apr 2013)
Log Message
Merged 140893. <rdar://problem/13334946>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (148344 => 148345)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-13 04:18:32 UTC (rev 148344)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-13 04:23:45 UTC (rev 148345)
@@ -1,5 +1,24 @@
2013-04-12 Ryosuke Niwa <[email protected]>
+ Merge 140893
+
+ 2013-01-30 Kentaro Hara <[email protected]>
+
+ Remove InjectedScript::wrapSerializedObject()
+ https://bugs.webkit.org/show_bug.cgi?id=107906
+
+ Reviewed by Abhishek Arya.
+
+ InjectedScript::wrapSerializedObject() is unused.
+ (This is one of steps to remove raw pointers of SerializedScriptValue*,
+ which can be a security concern.)
+
+ * inspector/InjectedScript.cpp:
+ * inspector/InjectedScript.h:
+ (InjectedScript):
+
+2013-04-12 Ryosuke Niwa <[email protected]>
+
Merge 141315
2013-01-30 Kentaro Hara <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/inspector/InjectedScript.cpp (148344 => 148345)
--- branches/safari-536.30-branch/Source/WebCore/inspector/InjectedScript.cpp 2013-04-13 04:18:32 UTC (rev 148344)
+++ branches/safari-536.30-branch/Source/WebCore/inspector/InjectedScript.cpp 2013-04-13 04:23:45 UTC (rev 148345)
@@ -184,12 +184,6 @@
return wrapObject(nodeAsScriptValue(node), groupName);
}
-PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapSerializedObject(SerializedScriptValue* serializedScriptValue, const String& groupName) const
-{
- ScriptValue scriptValue = serializedScriptValue->deserializeForInspector(m_injectedScriptObject.scriptState());
- return scriptValue.hasNoValue() ? 0 : wrapObject(scriptValue, groupName);
-}
-
void InjectedScript::inspectNode(Node* node)
{
ASSERT(!hasNoValue());
Modified: branches/safari-536.30-branch/Source/WebCore/inspector/InjectedScript.h (148344 => 148345)
--- branches/safari-536.30-branch/Source/WebCore/inspector/InjectedScript.h 2013-04-13 04:18:32 UTC (rev 148344)
+++ branches/safari-536.30-branch/Source/WebCore/inspector/InjectedScript.h 2013-04-13 04:23:45 UTC (rev 148345)
@@ -92,7 +92,6 @@
PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapObject(ScriptValue, const String& groupName) const;
PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapNode(Node*, const String& groupName);
- PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapSerializedObject(SerializedScriptValue*, const String& groupName) const;
void inspectNode(Node*);
void releaseObjectGroup(const String&);
ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
