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

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

Issue 2267403006: Remove redundant IsEmpty checks after calling toV8() Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: temp Created 4 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ScriptPromiseProperty_h 5 #ifndef ScriptPromiseProperty_h
6 #define ScriptPromiseProperty_h 6 #define ScriptPromiseProperty_h
7 7
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptPromisePropertyBase.h" 9 #include "bindings/core/v8/ScriptPromisePropertyBase.h"
10 #include "bindings/core/v8/ToV8.h" 10 #include "bindings/core/v8/ToV8.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 112 }
113 if (!getExecutionContext() || getExecutionContext()->activeDOMObjectsAreStop ped()) 113 if (!getExecutionContext() || getExecutionContext()->activeDOMObjectsAreStop ped())
114 return; 114 return;
115 m_rejected = value; 115 m_rejected = value;
116 resolveOrReject(Rejected); 116 resolveOrReject(Rejected);
117 } 117 }
118 118
119 template<typename HolderType, typename ResolvedType, typename RejectedType> 119 template<typename HolderType, typename ResolvedType, typename RejectedType>
120 v8::Local<v8::Object> ScriptPromiseProperty<HolderType, ResolvedType, RejectedTy pe>::holder(v8::Isolate* isolate, v8::Local<v8::Object> creationContext) 120 v8::Local<v8::Object> ScriptPromiseProperty<HolderType, ResolvedType, RejectedTy pe>::holder(v8::Isolate* isolate, v8::Local<v8::Object> creationContext)
121 { 121 {
122 v8::Local<v8::Value> value = toV8(m_holder, creationContext, isolate); 122 return toV8(m_holder, creationContext, isolate).template As<v8::Object>();
123 if (value.IsEmpty())
124 return v8::Local<v8::Object>();
125 return value.As<v8::Object>();
126 } 123 }
127 124
128 template<typename HolderType, typename ResolvedType, typename RejectedType> 125 template<typename HolderType, typename ResolvedType, typename RejectedType>
129 v8::Local<v8::Value> ScriptPromiseProperty<HolderType, ResolvedType, RejectedTyp e>::resolvedValue(v8::Isolate* isolate, v8::Local<v8::Object> creationContext) 126 v8::Local<v8::Value> ScriptPromiseProperty<HolderType, ResolvedType, RejectedTyp e>::resolvedValue(v8::Isolate* isolate, v8::Local<v8::Object> creationContext)
130 { 127 {
131 ASSERT(getState() == Resolved); 128 ASSERT(getState() == Resolved);
132 return toV8(m_resolved, creationContext, isolate); 129 return toV8(m_resolved, creationContext, isolate);
133 } 130 }
134 131
135 template<typename HolderType, typename ResolvedType, typename RejectedType> 132 template<typename HolderType, typename ResolvedType, typename RejectedType>
(...skipping 22 matching lines...) Expand all
158 { 155 {
159 TraceIfNeeded<HolderType>::trace(visitor, m_holder); 156 TraceIfNeeded<HolderType>::trace(visitor, m_holder);
160 TraceIfNeeded<ResolvedType>::trace(visitor, m_resolved); 157 TraceIfNeeded<ResolvedType>::trace(visitor, m_resolved);
161 TraceIfNeeded<RejectedType>::trace(visitor, m_rejected); 158 TraceIfNeeded<RejectedType>::trace(visitor, m_rejected);
162 ScriptPromisePropertyBase::trace(visitor); 159 ScriptPromisePropertyBase::trace(visitor);
163 } 160 }
164 161
165 } // namespace blink 162 } // namespace blink
166 163
167 #endif // ScriptPromiseProperty_h 164 #endif // ScriptPromiseProperty_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698