Attachment #29501 for bug #25210

View Details Raw Unified Return to Bug 25210

| Differences between



#import "ScriptController.h"
#import "SimpleFontData.h"
#import "TreeWalker.h"
#import "WebScriptObjectPrivate.h"
#import <wtf/HashMap.h>

#if ENABLE(SVG_DOM_OBJC_BINDINGS)
#import "DOMSVG.h"
#import "SVGElement.h"
#import "SVGElementInstance.h"
#import "SVGNames.h"
#import "DOMSVG.h"
#endif

using namespace JSC;




#import "DOMObject.h"
#import "HitTestResult.h"
#import "WebScriptObjectPrivate.h"

#if ENABLE(XPATH)
#import "DOMXPathExpressionInternal.h"


namespace JSC {
    class JSObject;
    
    namespace Bindings {
        class RootObject;
    }

    class NodeFilter;

#if ENABLE(SVG_DOM_OBJC_BINDINGS)
    class TransformationMatrix;
    class FloatPoint;
    class FloatRect;
    class TransformationMatrix;
#endif

#if ENABLE(XPATH)
    class XPathNSResolver;
#endif
}

// Core Internal Interfaces

}
- (id)_init;
@end

// Traversal Internal Interfaces

@interface DOMNodeFilter : DOMObject <DOMNodeFilter>
+ (DOMNodeFilter *)_wrapNodeFilter:(WebCore::NodeFilter *)impl;
@end

#if ENABLE(XPATH)

// XPath Internal Interfaces

@interface DOMNativeXPathNSResolver : DOMObject <DOMXPathNSResolver>
+ (DOMNativeXPathNSResolver *)_wrapXPathNSResolver:(WebCore::XPathNSResolver *)impl;
- (WebCore::XPathNSResolver *)_xpathNSResolver;
@end

#endif // ENABLE(XPATH)

// Helper functions for DOM wrappers and gluing to Objective-C

namespace WebCore {

    // 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();
    NSMapTable* createWrapperCacheWithIntegerKeys(); // Same, but from integers to ObjC objects.

        addDOMWrapper(wrapper, reinterpret_cast<DOMObjectInternal*>(impl));
    }

    DOMNodeFilter *wrapObjC(NodeFilter*);

#if ENABLE(XPATH)
    DOMNativeXPathNSResolver *wrapObjC(XPathNSResolver*);
    XPathNSResolver *unwrap(DOMNativeXPathNSResolver *);
#endif // ENABLE(XPATH)

} // namespace WebCore



}

@end

@implementation DOMObject (WebCoreInternal)

- (id)_init
{
    return [super _init];
}

@end

Return to Bug 25210

Lines 29-34 WebCore/bindings/objc/DOMInternal.h_sec1
- WebCore/bindings/objc/DOMInternal.h -15 / +14 lines
29		29
30	#import "DOMObject.h"	30	#import "DOMObject.h"
31	#import "HitTestResult.h"	31	#import "HitTestResult.h"
		32	#import "WebScriptObjectPrivate.h"
32		33
33	#if ENABLE(XPATH)	34	#if ENABLE(XPATH)
34	#import "DOMXPathExpressionInternal.h"	35	#import "DOMXPathExpressionInternal.h"
Lines 290-296 WebCore/bindings/objc/DOMInternal.h_sec2
290		291
291	namespace JSC {	292	namespace JSC {
292	class JSObject;	293	class JSObject;
293
294	namespace Bindings {	294	namespace Bindings {
295	class RootObject;	295	class RootObject;
296	}	296	}
Lines 300-325 namespace WebCore { WebCore/bindings/objc/DOMInternal.h_sec3
300	class NodeFilter;	300	class NodeFilter;
301		301
302	#if ENABLE(SVG_DOM_OBJC_BINDINGS)	302	#if ENABLE(SVG_DOM_OBJC_BINDINGS)
303	class TransformationMatrix;
304	class FloatPoint;	303	class FloatPoint;
305	class FloatRect;	304	class FloatRect;
306	#endif // ENABLE(SVG_DOM_OBJC_BINDINGS)	305	class TransformationMatrix;
		306	#endif
307		307
308	#if ENABLE(XPATH)	308	#if ENABLE(XPATH)
309	class XPathNSResolver;	309	class XPathNSResolver;
310	#endif // ENABLE(XPATH)	310	#endif
311	}
312
313	// Core Internal Interfaces
314		311
315	@interface DOMObject (WebCoreInternal)	312	}
316	- (id)_init;
317	@end
318		313
319	// Traversal Internal Interfaces	314	// Traversal Internal Interfaces
320		315
321	@interface DOMNodeFilter : DOMObject <DOMNodeFilter>	316	@interface DOMNodeFilter : DOMObject <DOMNodeFilter>
322	+ (DOMNodeFilter )_wrapNodeFilter:(WebCore::NodeFilter )impl;
323	@end	317	@end
324		318
325	#if ENABLE(XPATH)	319	#if ENABLE(XPATH)
Lines 327-342 namespace WebCore { WebCore/bindings/objc/DOMInternal.h_sec4
327	// XPath Internal Interfaces	321	// XPath Internal Interfaces
328		322
329	@interface DOMNativeXPathNSResolver : DOMObject <DOMXPathNSResolver>	323	@interface DOMNativeXPathNSResolver : DOMObject <DOMXPathNSResolver>
330	+ (DOMNativeXPathNSResolver )_wrapXPathNSResolver:(WebCore::XPathNSResolver )impl;
331	- (WebCore::XPathNSResolver *)_xpathNSResolver;
332	@end	324	@end
333		325
334	#endif // ENABLE(XPATH)	326	#endif // ENABLE(XPATH)
335		327
336	// Helper functions for DOM wrappers and gluing to Objective-C
337
338	namespace WebCore {	328	namespace WebCore {
339		329
		330	// Helper functions for DOM wrappers and gluing to Objective-C
		331
340	// Create an NSMapTable mapping from pointers to ObjC objects held with zeroing weak references.	332	// Create an NSMapTable mapping from pointers to ObjC objects held with zeroing weak references.
341	NSMapTable* createWrapperCache();	333	NSMapTable* createWrapperCache();
342	NSMapTable* createWrapperCacheWithIntegerKeys(); // Same, but from integers to ObjC objects.	334	NSMapTable* createWrapperCacheWithIntegerKeys(); // Same, but from integers to ObjC objects.
Lines 359-362 namespace WebCore { WebCore/bindings/objc/DOMInternal.h_sec5
359	addDOMWrapper(wrapper, reinterpret_cast<DOMObjectInternal*>(impl));	351	addDOMWrapper(wrapper, reinterpret_cast<DOMObjectInternal*>(impl));
360	}	352	}
361		353
		354	DOMNodeFilter wrapObjC(NodeFilter);
		355
		356	#if ENABLE(XPATH)
		357	DOMNativeXPathNSResolver wrapObjC(XPathNSResolver);
		358	XPathNSResolver unwrap(DOMNativeXPathNSResolver );
		359	#endif // ENABLE(XPATH)
		360
362	} // namespace WebCore	361	} // namespace WebCore

Lines 84-95 WebCore/bindings/objc/DOMObject.mm_sec1
- WebCore/bindings/objc/DOMObject.mm -9 lines
84	}	84	}
85		85
86	@end	86	@end
87
88	@implementation DOMObject (WebCoreInternal)
89
90	- (id)_init
91	{
92	return [super _init];
93	}
94
95	@end

Lines 41-54 WebCore/bindings/objc/DOM.mm_sec1
- WebCore/bindings/objc/DOM.mm -2 / +2 lines
41	#import "ScriptController.h"	41	#import "ScriptController.h"
42	#import "SimpleFontData.h"	42	#import "SimpleFontData.h"
43	#import "TreeWalker.h"	43	#import "TreeWalker.h"
44		44	#import "WebScriptObjectPrivate.h"
45	#import <wtf/HashMap.h>	45	#import <wtf/HashMap.h>
46		46
47	#if ENABLE(SVG_DOM_OBJC_BINDINGS)	47	#if ENABLE(SVG_DOM_OBJC_BINDINGS)
		48	#import "DOMSVG.h"
48	#import "SVGElement.h"	49	#import "SVGElement.h"
49	#import "SVGElementInstance.h"	50	#import "SVGElementInstance.h"
50	#import "SVGNames.h"	51	#import "SVGNames.h"
51	#import "DOMSVG.h"
52	#endif	52	#endif
53		53
54	using namespace JSC;	54	using namespace JSC;