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

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

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 class JSONValue; 44 class JSONValue;
45 class RemoteObjectId; 45 class RemoteObjectId;
46 class ScriptFunctionCall; 46 class ScriptFunctionCall;
47 47
48 typedef String ErrorString; 48 typedef String ErrorString;
49 PassRefPtr<JSONValue> toJSONValue(const ScriptValue&); 49 PassRefPtr<JSONValue> toJSONValue(const ScriptValue&);
50 50
51 51
52 class InjectedScript final { 52 class InjectedScript final {
53 DISALLOW_ALLOCATION(); 53 DISALLOW_NEW();
54 public: 54 public:
55 InjectedScript(); 55 InjectedScript();
56 ~InjectedScript(); 56 ~InjectedScript();
57 57
58 bool isEmpty() const { return m_injectedScriptObject.isEmpty(); } 58 bool isEmpty() const { return m_injectedScriptObject.isEmpty(); }
59 ScriptState* scriptState() const 59 ScriptState* scriptState() const
60 { 60 {
61 ASSERT(!isEmpty()); 61 ASSERT(!isEmpty());
62 return m_injectedScriptObject.scriptState(); 62 return m_injectedScriptObject.scriptState();
63 } 63 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 void makeCallWithExceptionDetails(ScriptFunctionCall&, RefPtr<JSONValue>* re sult, RefPtr<TypeBuilder::Debugger::ExceptionDetails>*); 129 void makeCallWithExceptionDetails(ScriptFunctionCall&, RefPtr<JSONValue>* re sult, RefPtr<TypeBuilder::Debugger::ExceptionDetails>*);
130 130
131 ScriptValue m_injectedScriptObject; 131 ScriptValue m_injectedScriptObject;
132 InspectedStateAccessCheck m_inspectedStateAccessCheck; 132 InspectedStateAccessCheck m_inspectedStateAccessCheck;
133 RefPtr<InjectedScriptNative> m_native; 133 RefPtr<InjectedScriptNative> m_native;
134 }; 134 };
135 135
136 } // namespace blink 136 } // namespace blink
137 137
138 #endif 138 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698