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

Side by Side Diff: Source/core/inspector/ScriptArguments.cpp

Issue 23513066: Pass isolate to ScriptPromise and ScriptString constructors (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix nits Created 7 years, 3 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
« no previous file with comments | « Source/bindings/v8/ScriptValue.cpp ('k') | no next file » | 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) 2010 Google Inc. All rights reserved. 2 * Copyright (c) 2010 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 const ScriptValue& value = argumentAt(0); 70 const ScriptValue& value = argumentAt(0);
71 ScriptScope scope(m_scriptState.get()); 71 ScriptScope scope(m_scriptState.get());
72 if (checkForNullOrUndefined && (value.isNull() || value.isUndefined())) 72 if (checkForNullOrUndefined && (value.isNull() || value.isUndefined()))
73 return false; 73 return false;
74 74
75 if (!globalState()) { 75 if (!globalState()) {
76 ASSERT_NOT_REACHED(); 76 ASSERT_NOT_REACHED();
77 return false; 77 return false;
78 } 78 }
79 79
80 result = value.toString(globalState()); 80 result = value.toString();
81 return true; 81 return true;
82 } 82 }
83 83
84 bool ScriptArguments::isEqual(ScriptArguments* other) const 84 bool ScriptArguments::isEqual(ScriptArguments* other) const
85 { 85 {
86 if (!other) 86 if (!other)
87 return false; 87 return false;
88 88
89 if (m_arguments.size() != other->m_arguments.size()) 89 if (m_arguments.size() != other->m_arguments.size())
90 return false; 90 return false;
91 if (!globalState() && m_arguments.size()) 91 if (!globalState() && m_arguments.size())
92 return false; 92 return false;
93 93
94 for (size_t i = 0; i < m_arguments.size(); ++i) { 94 for (size_t i = 0; i < m_arguments.size(); ++i) {
95 if (!m_arguments[i].isEqual(other->globalState(), other->m_arguments[i]) ) 95 if (!m_arguments[i].isEqual(other->globalState(), other->m_arguments[i]) )
96 return false; 96 return false;
97 } 97 }
98 return true; 98 return true;
99 } 99 }
100 100
101 } // namespace WebCore 101 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/ScriptValue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698