Remove V8HiddenPropertyName

Source/bindings/v8/custom/V8PopStateEventCustom.cpp

 /*
  * Copyright (C) 2010 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 15 matching lines @@
  * 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 "config.h"
 #include "V8PopStateEvent.h"
 
 #include "V8History.h"
 #include "bindings/v8/SerializedScriptValue.h"
-#include "bindings/v8/V8HiddenPropertyName.h"
 #include "core/events/PopStateEvent.h"
 #include "core/frame/History.h"
 
 namespace WebCore {
 
 // Save the state value to a hidden attribute in the V8PopStateEvent, and return it, for convenience.
 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> popStateEvent, v8::Handle<v8::Value> state, v8::Isolate* isolate)
 {
-    popStateEvent->SetHiddenValue(V8HiddenPropertyName::state(isolate), state);
+    setHiddenValue(isolate, popStateEvent, "state", state);
     return state;
 }
 
 void V8PopStateEvent::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
 {
-    v8::Handle<v8::Value> result = info.Holder()->GetHiddenValue(V8HiddenPropertyName::state(info.GetIsolate()));
+    v8::Handle<v8::Value> result = getHiddenValue(info.GetIsolate(), info.Holder(), "state");
 
     if (!result.IsEmpty()) {
         v8SetReturnValue(info, result);
         return;
     }
 
     PopStateEvent* event = V8PopStateEvent::toNative(info.Holder());
     History* history = event->history();
     if (!history || !event->serializedState()) {
         if (!event->serializedState()) {
             // If we're in an isolated world and the event was created in the main world,
             // we need to find the 'state' property on the main world wrapper and clone it.
-            v8::Local<v8::Value> mainWorldState = getHiddenValueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenPropertyName::state(info.GetIsolate()));
+            v8::Local<v8::Value> mainWorldState = getHiddenValueFromMainWorldWrapper(info.GetIsolate(), event, "state");
             if (!mainWorldState.IsEmpty())
                 event->setSerializedState(SerializedScriptValue::createAndSwallowExceptions(mainWorldState, info.GetIsolate()));
         }
         if (event->serializedState())
             result = event->serializedState()->deserialize();
         else
             result = v8::Null(info.GetIsolate());
         v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()));
         return;
     }
 
     // There's no cached value from a previous invocation, nor a state value was provided by the
     // event, but there is a history object, so first we need to see if the state object has been
     // deserialized through the history object already.
     // The current history state object might've changed in the meantime, so we need to take care
     // of using the correct one, and always share the same deserialization with history.state.
 
     bool isSameState = history->isSameAsCurrentState(event->serializedState());
 
     if (isSameState) {
         v8::Handle<v8::Object> v8History = toV8(history, info.Holder(), info.GetIsolate()).As<v8::Object>();
         if (!history->stateChanged()) {
-            result = v8History->GetHiddenValue(V8HiddenPropertyName::state(info.GetIsolate()));
+            result = getHiddenValue(info.GetIsolate(), v8History, "state");
             if (!result.IsEmpty()) {
                 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()));
                 return;
             }
         }
         result = event->serializedState()->deserialize(info.GetIsolate());
-        v8History->SetHiddenValue(V8HiddenPropertyName::state(info.GetIsolate()), result);
+        setHiddenValue(info.GetIsolate(), v8History, "state", result);
     } else {
         result = event->serializedState()->deserialize(info.GetIsolate());
     }
 
     v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()));
 }
 
 } // namespace WebCore