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

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

Issue 1020233002: [bindings] [devtools] Migrate the usage of ScriptValue.toJSONValue() to ScriptValue::to<JSONValuePt… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 5 years, 9 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
« no previous file with comments | « Source/core/inspector/InjectedScript.cpp ('k') | Source/core/inspector/InjectedScriptBase.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 24 matching lines...) Expand all
35 #include "bindings/core/v8/ScriptValue.h" 35 #include "bindings/core/v8/ScriptValue.h"
36 #include "core/InspectorTypeBuilder.h" 36 #include "core/InspectorTypeBuilder.h"
37 #include "wtf/Forward.h" 37 #include "wtf/Forward.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class JSONValue; 41 class JSONValue;
42 class ScriptFunctionCall; 42 class ScriptFunctionCall;
43 43
44 typedef String ErrorString; 44 typedef String ErrorString;
45 45 PassRefPtr<JSONValue> toJSONValue(const ScriptValue&);
46 46
47 class InjectedScriptBase { 47 class InjectedScriptBase {
48 public: 48 public:
49 virtual ~InjectedScriptBase() { } 49 virtual ~InjectedScriptBase() { }
50 50
51 const String& name() const { return m_name; } 51 const String& name() const { return m_name; }
52 bool isEmpty() const { return m_injectedScriptObject.isEmpty(); } 52 bool isEmpty() const { return m_injectedScriptObject.isEmpty(); }
53 ScriptState* scriptState() const 53 ScriptState* scriptState() const
54 { 54 {
55 ASSERT(!isEmpty()); 55 ASSERT(!isEmpty());
(...skipping 15 matching lines...) Expand all
71 private: 71 private:
72 String m_name; 72 String m_name;
73 ScriptValue m_injectedScriptObject; 73 ScriptValue m_injectedScriptObject;
74 InspectedStateAccessCheck m_inspectedStateAccessCheck; 74 InspectedStateAccessCheck m_inspectedStateAccessCheck;
75 }; 75 };
76 76
77 77
78 } // namespace blink 78 } // namespace blink
79 79
80 #endif 80 #endif
OLDNEW
« no previous file with comments | « Source/core/inspector/InjectedScript.cpp ('k') | Source/core/inspector/InjectedScriptBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698