[Bindings] Move and remove some private symbols from V8HiddenValue

third_party/WebKit/Source/bindings/core/v8/V8V0CustomElementLifecycleCallbacks.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "bindings/core/v8/V8V0CustomElementLifecycleCallbacks.h"
 
+#include <memory>
 #include "bindings/core/v8/DOMDataStore.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/V0CustomElementBinding.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8Element.h"
-#include "bindings/core/v8/V8HiddenValue.h"
 #include "bindings/core/v8/V8PerContextData.h"
+#include "bindings/core/v8/V8PrivateProperty.h"
 #include "core/dom/ExecutionContext.h"
-#include <memory>
 
 namespace blink {
 
 #define CALLBACK_LIST(V)        \
   V(created, CreatedCallback)   \
   V(attached, AttachedCallback) \
   V(detached, DetachedCallback) \
   V(attributeChanged, AttributeChangedCallback)
 
 V8V0CustomElementLifecycleCallbacks*
 V8V0CustomElementLifecycleCallbacks::create(
     ScriptState* scriptState,
     v8::Local<v8::Object> prototype,
     v8::MaybeLocal<v8::Function> created,
     v8::MaybeLocal<v8::Function> attached,
     v8::MaybeLocal<v8::Function> detached,
     v8::MaybeLocal<v8::Function> attributeChanged) {
   v8::Isolate* isolate = scriptState->isolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+
 // A given object can only be used as a Custom Element prototype
 // once; see customElementIsInterfacePrototypeObject
-#define SET_HIDDEN_VALUE(Value, Name)                                          \
-  ASSERT(                                                                      \
-      V8HiddenValue::getHiddenValue(                                           \
-          scriptState, prototype, V8HiddenValue::customElement##Name(isolate)) \
-          .IsEmpty());                                                         \
-  if (!Value.IsEmpty())                                                        \
-    V8HiddenValue::setHiddenValue(scriptState, prototype,                      \
-                                  V8HiddenValue::customElement##Name(isolate), \
-                                  Value.ToLocalChecked());
+#define SET_PRIVATE_PROPERTY(Value, Name)                 \
+  V8PrivateProperty::Symbol symbol##Name =                \
+      V8PrivateProperty::getCustomElement##Name(isolate); \
+  DCHECK(symbol##Name.hasValue(context, prototype));      \

[Yuki, 2017/03/29 12:36:05]

DCHECK(!hasValue);

[peria, 2017/03/30 09:30:16]

Done.

+  if (!Value.IsEmpty())                                   \
+    symbol##Name.set(context, prototype, Value.ToLocalChecked());

[Yuki, 2017/03/29 12:36:05]

This pattern looks a bit strange.  Should be:

  v8::Local<v8::Value> value;
  if (Maybe.ToLocal(value))
    symbol##Name.set(context, prototype, value);

where Value is renamed to Maybe because it conflicts v8::Value.

[peria, 2017/03/30 09:30:16]

Done.

 
-  CALLBACK_LIST(SET_HIDDEN_VALUE)
-#undef SET_HIDDEN_VALUE
+  CALLBACK_LIST(SET_PRIVATE_PROPERTY)
+#undef SET_PRIVATE_PROPERTY
 
   return new V8V0CustomElementLifecycleCallbacks(
       scriptState, prototype, created, attached, detached, attributeChanged);
 }
 
 static V0CustomElementLifecycleCallbacks::CallbackType flagSet(
     v8::MaybeLocal<v8::Function> attached,
     v8::MaybeLocal<v8::Function> detached,
     v8::MaybeLocal<v8::Function> attributeChanged) {
   // V8 Custom Elements always run created to swizzle prototypes.
@@ skipping 162 matching lines @@
   exceptionCatcher.SetVerbose(true);
   V8ScriptRunner::callFunction(callback, m_scriptState->getExecutionContext(),
                                receiver, 0, 0, isolate);
 }
 
 DEFINE_TRACE(V8V0CustomElementLifecycleCallbacks) {
   V0CustomElementLifecycleCallbacks::trace(visitor);
 }
 
 }  // namespace blink