Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Side by Side Diff: Source/core/inspector/InjectedScriptHost.h

Issue 326853002: Revert of Add an ASSERT about cross-world wrapper leakage into ScriptValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 public: 60 public:
61 static PassRefPtr<InjectedScriptHost> create(); 61 static PassRefPtr<InjectedScriptHost> create();
62 ~InjectedScriptHost(); 62 ~InjectedScriptHost();
63 63
64 void init(InstrumentingAgents* instrumentingAgents, ScriptDebugServer* scrip tDebugServer) 64 void init(InstrumentingAgents* instrumentingAgents, ScriptDebugServer* scrip tDebugServer)
65 { 65 {
66 m_instrumentingAgents = instrumentingAgents; 66 m_instrumentingAgents = instrumentingAgents;
67 m_scriptDebugServer = scriptDebugServer; 67 m_scriptDebugServer = scriptDebugServer;
68 } 68 }
69 69
70 static Node* scriptValueAsNode(ScriptState*, ScriptValue); 70 static Node* scriptValueAsNode(ScriptValue);
71 static ScriptValue nodeAsScriptValue(ScriptState*, Node*); 71 static ScriptValue nodeAsScriptValue(ScriptState*, Node*);
72 72
73 void disconnect(); 73 void disconnect();
74 74
75 class InspectableObject { 75 class InspectableObject {
76 WTF_MAKE_FAST_ALLOCATED; 76 WTF_MAKE_FAST_ALLOCATED;
77 public: 77 public:
78 virtual ScriptValue get(ScriptState*); 78 virtual ScriptValue get(ScriptState*);
79 virtual ~InspectableObject() { } 79 virtual ~InspectableObject() { }
80 }; 80 };
(...skipping 17 matching lines...) Expand all
98 98
99 InstrumentingAgents* m_instrumentingAgents; 99 InstrumentingAgents* m_instrumentingAgents;
100 ScriptDebugServer* m_scriptDebugServer; 100 ScriptDebugServer* m_scriptDebugServer;
101 Vector<OwnPtr<InspectableObject> > m_inspectedObjects; 101 Vector<OwnPtr<InspectableObject> > m_inspectedObjects;
102 OwnPtr<InspectableObject> m_defaultInspectableObject; 102 OwnPtr<InspectableObject> m_defaultInspectableObject;
103 }; 103 };
104 104
105 } // namespace WebCore 105 } // namespace WebCore
106 106
107 #endif // !defined(InjectedScriptHost_h) 107 #endif // !defined(InjectedScriptHost_h)
OLDNEW
« no previous file with comments | « Source/core/inspector/InjectedScriptBase.cpp ('k') | Source/core/inspector/JavaScriptCallFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698