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

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

Issue 1636223002: DevTools: remove ScriptState/Value from the InjectedScript APIs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments addressed Created 4 years, 10 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
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 m_clearConsoleCallback = std::move(clearConsoleCallback); 72 m_clearConsoleCallback = std::move(clearConsoleCallback);
73 m_debugger = debugger; 73 m_debugger = debugger;
74 m_client = std::move(injectedScriptHostClient); 74 m_client = std::move(injectedScriptHostClient);
75 } 75 }
76 76
77 void disconnect(); 77 void disconnect();
78 78
79 class InspectableObject { 79 class InspectableObject {
80 USING_FAST_MALLOC(InspectableObject); 80 USING_FAST_MALLOC(InspectableObject);
81 public: 81 public:
82 virtual ScriptValue get(ScriptState*); 82 virtual v8::Local<v8::Value> get(v8::Local<v8::Context>);
83 virtual ~InspectableObject() { } 83 virtual ~InspectableObject() { }
84 }; 84 };
85 void addInspectedObject(PassOwnPtr<InspectableObject>); 85 void addInspectedObject(PassOwnPtr<InspectableObject>);
86 void clearInspectedObjects(); 86 void clearInspectedObjects();
87 InspectableObject* inspectedObject(unsigned num); 87 InspectableObject* inspectedObject(unsigned num);
88 88
89 void inspectImpl(PassRefPtr<JSONValue> objectToInspect, PassRefPtr<JSONValue > hints); 89 void inspectImpl(PassRefPtr<JSONValue> objectToInspect, PassRefPtr<JSONValue > hints);
90 90
91 void clearConsoleMessages(); 91 void clearConsoleMessages();
92 void debugFunction(const String& scriptId, int lineNumber, int columnNumber) ; 92 void debugFunction(const String& scriptId, int lineNumber, int columnNumber) ;
(...skipping 17 matching lines...) Expand all
110 V8Debugger* m_debugger; 110 V8Debugger* m_debugger;
111 Vector<OwnPtr<InspectableObject>> m_inspectedObjects; 111 Vector<OwnPtr<InspectableObject>> m_inspectedObjects;
112 OwnPtr<InspectableObject> m_defaultInspectableObject; 112 OwnPtr<InspectableObject> m_defaultInspectableObject;
113 OwnPtr<InjectedScriptHostClient> m_client; 113 OwnPtr<InjectedScriptHostClient> m_client;
114 v8::Global<v8::FunctionTemplate> m_wrapperTemplate; 114 v8::Global<v8::FunctionTemplate> m_wrapperTemplate;
115 }; 115 };
116 116
117 } // namespace blink 117 } // namespace blink
118 118
119 #endif // InjectedScriptHost_h 119 #endif // InjectedScriptHost_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698