Revert change 12507 and 12532 because it breaks the ...

webkit/port/bindings/v8/v8_proxy.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_PROXY_H__
 #define V8_PROXY_H__
 
 #include <v8.h>
+#include "dom_wrapper_map.h"
 #include "v8_index.h"
 #include "v8_custom.h"
 #include "v8_utility.h"
 #include "ChromiumBridge.h"
 #include "Node.h"
 #include "NodeFilter.h"
 #include "PlatformString.h"  // for WebCore::String
 #include "ScriptSourceCode.h"  // for WebCore::ScriptSourceCode
 #include "SecurityOrigin.h"  // for WebCore::SecurityOrigin
-#include "V8DOMMap.h"
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h> // so generated bindings don't have to
 #include <wtf/Vector.h>
 
 #include <iterator>
 #include <list>
 
 #ifdef ENABLE_DOM_STATS_COUNTERS
 #define INC_STATS(name) ChromiumBridge::incrementStatsCounter(name)
 #else
 #define INC_STATS(name)
 #endif
 
-// FIXME: Remove the following hack when we replace all references to GetDOMObjectMap.
-#define GetDOMObjectMap getDOMObjectMap
-
 namespace WebCore {
 
 class CSSStyleDeclaration;
 class DOMImplementation;
 class Element;
 class Event;
 class EventListener;
 class Frame;
 class HTMLCollection;
 class HTMLOptionsCollection;
@@ skipping 95 matching lines @@
 struct BatchedConstant {
   const char* const name;
   int value;
 };
 
 void BatchConfigureConstants(v8::Handle<v8::FunctionTemplate> desc,
                              v8::Handle<v8::ObjectTemplate> proto,
                              const BatchedConstant* consts,
                              size_t num_consts);
 
+DOMWrapperMap<void>& GetDOMObjectMap();
+
 const int kMaxRecursionDepth = 20;
 
 // Information about an extension that is registered for use with V8. If scheme
 // is non-empty, it contains the URL scheme the extension should be used with.
 // Otherwise, the extension is used with all schemes.
 struct V8ExtensionInfo {
   String scheme;
   v8::Extension* extension;
 };
 typedef std::list<V8ExtensionInfo> V8ExtensionList;
@@ skipping 449 matching lines @@
   V8Proxy::SetDOMWrapper(args.Holder(), tag, obj.get());
   obj->ref();
   V8Proxy::SetJSWrapperForDOMObject(
       obj.get(), v8::Persistent<v8::Object>::New(args.Holder()));
   return args.Holder();
 }
 
 }  // namespace WebCore
 
 #endif  // V8_PROXY_H__