Chromium Code Reviews

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptValue.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 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 67 matching lines...)
78 ASSERT(isEmpty() || m_scriptState); 78 ASSERT(isEmpty() || m_scriptState);
79 } 79 }
80 80
81 ScriptValue(const ScriptValue& value) 81 ScriptValue(const ScriptValue& value)
82 : m_scriptState(value.m_scriptState) 82 : m_scriptState(value.m_scriptState)
83 , m_value(value.m_value) 83 , m_value(value.m_value)
84 { 84 {
85 ASSERT(isEmpty() || m_scriptState); 85 ASSERT(isEmpty() || m_scriptState);
86 } 86 }
87 87
88 ScriptState* scriptState() const 88 ScriptState* getScriptState() const
89 { 89 {
90 return m_scriptState.get(); 90 return m_scriptState.get();
91 } 91 }
92 92
93 v8::Isolate* isolate() const 93 v8::Isolate* isolate() const
94 { 94 {
95 return m_scriptState ? m_scriptState->isolate() : v8::Isolate::GetCurren t(); 95 return m_scriptState ? m_scriptState->isolate() : v8::Isolate::GetCurren t();
96 } 96 }
97 97
98 v8::Local<v8::Context> context() const 98 v8::Local<v8::Context> context() const
(...skipping 83 matching lines...)
182 static ScriptValue createNull(ScriptState*); 182 static ScriptValue createNull(ScriptState*);
183 183
184 private: 184 private:
185 RefPtr<ScriptState> m_scriptState; 185 RefPtr<ScriptState> m_scriptState;
186 RefPtr<SharedPersistent<v8::Value>> m_value; 186 RefPtr<SharedPersistent<v8::Value>> m_value;
187 }; 187 };
188 188
189 } // namespace blink 189 } // namespace blink
190 190
191 #endif // ScriptValue_h 191 #endif // ScriptValue_h
OLDNEW

Powered by Google App Engine