Commit 87530f97 authored by tzik's avatar tzik Committed by Commit Bot

Use fully qualified name for WTF::AdoptRef in bindings/

This CL replaces bare AdoptRef with WTF::AdoptRef, so that it doesn't
conflict with base::AdoptRef.

Bug: 763844
Change-Id: I1e8f822ae142d00882fc0c863666e3c3197d5e9e
Reviewed-on: https://chromium-review.googlesource.com/676983Reviewed-by: default avatarKouhei Ueno <kouhei@chromium.org>
Reviewed-by: default avatarKenichi Ishibashi <bashi@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503394}
parent 7b707ba4
...@@ -26,7 +26,7 @@ class RejectedPromises final : public RefCounted<RejectedPromises> { ...@@ -26,7 +26,7 @@ class RejectedPromises final : public RefCounted<RejectedPromises> {
public: public:
static RefPtr<RejectedPromises> Create() { static RefPtr<RejectedPromises> Create() {
return AdoptRef(new RejectedPromises()); return WTF::AdoptRef(new RejectedPromises());
} }
~RejectedPromises(); ~RejectedPromises();
......
...@@ -15,7 +15,7 @@ RefPtr<ScriptStateForTesting> ScriptStateForTesting::Create( ...@@ -15,7 +15,7 @@ RefPtr<ScriptStateForTesting> ScriptStateForTesting::Create(
v8::Local<v8::Context> context, v8::Local<v8::Context> context,
RefPtr<DOMWrapperWorld> world) { RefPtr<DOMWrapperWorld> world) {
RefPtr<ScriptStateForTesting> script_state = RefPtr<ScriptStateForTesting> script_state =
AdoptRef(new ScriptStateForTesting(context, std::move(world))); WTF::AdoptRef(new ScriptStateForTesting(context, std::move(world)));
// This ref() is for keeping this ScriptState alive as long as the v8::Context // This ref() is for keeping this ScriptState alive as long as the v8::Context
// is alive. This is deref()ed in the weak callback of the v8::Context. // is alive. This is deref()ed in the weak callback of the v8::Context.
script_state->Ref(); script_state->Ref();
......
...@@ -89,7 +89,7 @@ SerializedScriptValue::SerializeAndSwallowExceptions( ...@@ -89,7 +89,7 @@ SerializedScriptValue::SerializeAndSwallowExceptions(
} }
RefPtr<SerializedScriptValue> SerializedScriptValue::Create() { RefPtr<SerializedScriptValue> SerializedScriptValue::Create() {
return AdoptRef(new SerializedScriptValue); return WTF::AdoptRef(new SerializedScriptValue);
} }
RefPtr<SerializedScriptValue> SerializedScriptValue::Create( RefPtr<SerializedScriptValue> SerializedScriptValue::Create(
...@@ -102,8 +102,8 @@ RefPtr<SerializedScriptValue> SerializedScriptValue::Create( ...@@ -102,8 +102,8 @@ RefPtr<SerializedScriptValue> SerializedScriptValue::Create(
DataBufferPtr data_buffer = AllocateBuffer(data_buffer_size.ValueOrDie()); DataBufferPtr data_buffer = AllocateBuffer(data_buffer_size.ValueOrDie());
data.CopyTo(reinterpret_cast<UChar*>(data_buffer.get()), 0, data.length()); data.CopyTo(reinterpret_cast<UChar*>(data_buffer.get()), 0, data.length());
return AdoptRef(new SerializedScriptValue(std::move(data_buffer), return WTF::AdoptRef(new SerializedScriptValue(
data_buffer_size.ValueOrDie())); std::move(data_buffer), data_buffer_size.ValueOrDie()));
} }
// Versions 16 and below (prior to April 2017) used ntohs() to byte-swap SSV // Versions 16 and below (prior to April 2017) used ntohs() to byte-swap SSV
...@@ -226,7 +226,8 @@ RefPtr<SerializedScriptValue> SerializedScriptValue::Create(const char* data, ...@@ -226,7 +226,8 @@ RefPtr<SerializedScriptValue> SerializedScriptValue::Create(const char* data,
std::copy(data, data + length, data_buffer.get()); std::copy(data, data + length, data_buffer.get());
SwapWiredDataIfNeeded(data_buffer.get(), length); SwapWiredDataIfNeeded(data_buffer.get(), length);
return AdoptRef(new SerializedScriptValue(std::move(data_buffer), length)); return WTF::AdoptRef(
new SerializedScriptValue(std::move(data_buffer), length));
} }
RefPtr<SerializedScriptValue> SerializedScriptValue::Create( RefPtr<SerializedScriptValue> SerializedScriptValue::Create(
...@@ -244,7 +245,7 @@ RefPtr<SerializedScriptValue> SerializedScriptValue::Create( ...@@ -244,7 +245,7 @@ RefPtr<SerializedScriptValue> SerializedScriptValue::Create(
}); });
SwapWiredDataIfNeeded(data_buffer.get(), buffer->size()); SwapWiredDataIfNeeded(data_buffer.get(), buffer->size());
return AdoptRef( return WTF::AdoptRef(
new SerializedScriptValue(std::move(data_buffer), buffer->size())); new SerializedScriptValue(std::move(data_buffer), buffer->size()));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment