Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 99 insertions, 0 deletions

diff --git a/Source/WebCore/bindings/objc/DOMInternal.h b/Source/WebCore/bindings/objc/DOMInternal.h
new file mode 100644
index 0000000..6d2442b
--- /dev/null
+++ b/Source/WebCore/bindings/objc/DOMInternal.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 James G. Speth (speth@end.com)
+ * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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. 
+ */
+
+// This is lets our internals access DOMObject's _internal field while having
+// it be private for clients outside WebKit.
+#define private public
+#import "DOMObject.h"
+#undef private
+
+#import "DOMNodeFilter.h"
+#import "DOMXPathNSResolver.h"
+#import <wtf/Forward.h>
+
+namespace JSC {
+    class JSObject;
+    namespace Bindings {
+        class RootObject;
+    }
+}
+
+namespace WebCore {
+    class NodeFilter;
+#if ENABLE(XPATH)
+    class XPathNSResolver;
+#endif
+}
+
+@interface DOMNodeFilter : DOMObject <DOMNodeFilter>
+@end
+
+#if ENABLE(XPATH)
+@interface DOMNativeXPathNSResolver : DOMObject <DOMXPathNSResolver>
+@end
+#endif // ENABLE(XPATH)
+
+// Helper functions for DOM wrappers and gluing to Objective-C
+
+// Create an NSMapTable mapping from pointers to ObjC objects held with zeroing weak references.
+NSMapTable* createWrapperCache();
+
+id createDOMWrapper(JSC::JSObject*, PassRefPtr<JSC::Bindings::RootObject> origin, PassRefPtr<JSC::Bindings::RootObject> current);
+
+NSObject* getDOMWrapper(DOMObjectInternal*);
+void addDOMWrapper(NSObject* wrapper, DOMObjectInternal*);
+void removeDOMWrapper(DOMObjectInternal*);
+
+template <class Source>
+inline id getDOMWrapper(Source impl)
+{
+    return getDOMWrapper(reinterpret_cast<DOMObjectInternal*>(impl));
+}
+
+template <class Source>
+inline void addDOMWrapper(NSObject* wrapper, Source impl)
+{
+    addDOMWrapper(wrapper, reinterpret_cast<DOMObjectInternal*>(impl));
+}
+
+DOMNodeFilter *kit(WebCore::NodeFilter*);
+WebCore::NodeFilter* core(DOMNodeFilter *);
+
+#if ENABLE(XPATH)
+DOMNativeXPathNSResolver *kit(WebCore::XPathNSResolver*);
+WebCore::XPathNSResolver* core(DOMNativeXPathNSResolver *);
+#endif // ENABLE(XPATH)
+
+inline NSTimeInterval kit(double msSinceEpoch)
+{
+    return msSinceEpoch / 1000.0 - NSTimeIntervalSince1970;
+}
+
+inline double core(NSTimeInterval sec)
+{
+    return sec * 1000.0 + NSTimeIntervalSince1970;
+}