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

Side by Side Diff: Source/bindings/v8/ScriptValue.cpp

Issue 110633002: Remove calls to deprecated toWebCoreStringWithNullCheck(v8::Handle<v8::Value>) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase on master Created 7 years 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/bindings/v8/ScriptEventListener.cpp ('k') | Source/bindings/v8/V8Binding.h » ('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) 2008, 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2011 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 v8::Local<v8::Array> propertyNames = object->GetPropertyNames(); 102 v8::Local<v8::Array> propertyNames = object->GetPropertyNames();
103 uint32_t length = propertyNames->Length(); 103 uint32_t length = propertyNames->Length();
104 for (uint32_t i = 0; i < length; i++) { 104 for (uint32_t i = 0; i < length; i++) {
105 v8::Local<v8::Value> name = propertyNames->Get(v8::Int32::New(i, iso late)); 105 v8::Local<v8::Value> name = propertyNames->Get(v8::Int32::New(i, iso late));
106 // FIXME(yurys): v8::Object should support GetOwnPropertyNames 106 // FIXME(yurys): v8::Object should support GetOwnPropertyNames
107 if (name->IsString() && !object->HasRealNamedProperty(v8::Handle<v8: :String>::Cast(name))) 107 if (name->IsString() && !object->HasRealNamedProperty(v8::Handle<v8: :String>::Cast(name)))
108 continue; 108 continue;
109 RefPtr<JSONValue> propertyValue = v8ToJSONValue(object->Get(name), m axDepth, isolate); 109 RefPtr<JSONValue> propertyValue = v8ToJSONValue(object->Get(name), m axDepth, isolate);
110 if (!propertyValue) 110 if (!propertyValue)
111 return 0; 111 return 0;
112 jsonObject->setValue(toWebCoreStringWithNullCheck(name), propertyVal ue); 112 V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<WithNullChec k>, nameString, name, 0);
113 jsonObject->setValue(nameString, propertyValue);
113 } 114 }
114 return jsonObject; 115 return jsonObject;
115 } 116 }
116 ASSERT_NOT_REACHED(); 117 ASSERT_NOT_REACHED();
117 return 0; 118 return 0;
118 } 119 }
119 120
120 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const 121 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const
121 { 122 {
122 v8::HandleScope handleScope(scriptState->isolate()); 123 v8::HandleScope handleScope(scriptState->isolate());
123 // v8::Object::GetPropertyNames() expects current context to be not null. 124 // v8::Object::GetPropertyNames() expects current context to be not null.
124 v8::Context::Scope contextScope(scriptState->context()); 125 v8::Context::Scope contextScope(scriptState->context());
125 return v8ToJSONValue(v8Value(), JSONValue::maxDepth, scriptState->isolate()) ; 126 return v8ToJSONValue(v8Value(), JSONValue::maxDepth, scriptState->isolate()) ;
126 } 127 }
127 128
128 } // namespace WebCore 129 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/ScriptEventListener.cpp ('k') | Source/bindings/v8/V8Binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698