diff options
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 4 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 14 | ||||
| -rw-r--r-- | WebCore/ChangeLog | 6 | ||||
| -rw-r--r-- | WebCore/WebCore.xcodeproj/project.pbxproj | 14 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 362 | ||||
| -rw-r--r-- | WebCore/bindings/v8/custom/V8DocumentCustom.cpp | 8 | ||||
| -rw-r--r-- | WebCore/bindings/v8/custom/V8NavigatorCustom.cpp | 39 | ||||
| -rw-r--r-- | WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp | 12 |
8 files changed, 21 insertions, 438 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 166a955..d61d596 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -929,13 +929,9 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #if (CPU(X86) && PLATFORM(MAC)) \ || (CPU(X86_64) && PLATFORM(MAC)) \ || (CPU(ARM_THUMB2) && PLATFORM(IPHONE)) \ -<<<<<<< HEAD || (CPU(ARM_THUMB2) && PLATFORM(ANDROID) && ENABLE(ANDROID_JSC_JIT)) \ - || (CPU(X86) && PLATFORM(WIN)) -======= || (CPU(X86) && PLATFORM(WIN)) \ || (CPU(X86) && PLATFORM(WX)) ->>>>>>> webkit.org at r54340 #define ENABLE_YARR 1 #define ENABLE_YARR_JIT 1 #endif diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 922e233..192d8ae 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -103,11 +103,8 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8CSSStyleSheetCustom.cpp \ bindings/v8/custom/V8CSSValueCustom.cpp \ bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp \ -<<<<<<< HEAD -======= bindings/v8/custom/V8CanvasPixelArrayCustom.cpp \ bindings/v8/custom/V8ClientRectListCustom.cpp \ ->>>>>>> webkit.org at r54340 bindings/v8/custom/V8ClipboardCustom.cpp \ bindings/v8/custom/V8ConsoleCustom.cpp \ bindings/v8/custom/V8CoordinatesCustom.cpp \ @@ -162,11 +159,8 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8NodeFilterCustom.cpp \ bindings/v8/custom/V8NodeIteratorCustom.cpp \ bindings/v8/custom/V8NodeListCustom.cpp \ -<<<<<<< HEAD bindings/v8/custom/V8PopStateEventCustom.cpp \ -======= bindings/v8/custom/V8ScreenCustom.cpp \ ->>>>>>> webkit.org at r54340 bindings/v8/custom/V8SQLResultSetRowListCustom.cpp \ bindings/v8/custom/V8SQLTransactionCustom.cpp \ bindings/v8/custom/V8WebSocketCustom.cpp @@ -177,8 +171,8 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8SVGElementCustom.cpp \ bindings/v8/custom/V8SVGElementInstanceCustom.cpp \ bindings/v8/custom/V8SVGLengthCustom.cpp \ - bindings/v8/custom/V8SVGMatrixCustom.cpp - bindings/v8/custom/V8SVGPathSegCustom.cpp \ + bindings/v8/custom/V8SVGMatrixCustom.cpp \ + bindings/v8/custom/V8SVGPathSegCustom.cpp endif LOCAL_SRC_FILES += \ @@ -204,8 +198,4 @@ LOCAL_SRC_FILES += \ bridge/jni/v8/JNIUtilityPrivate.cpp \ bridge/jni/v8/JavaClassV8.cpp \ bridge/jni/v8/JavaInstanceV8.cpp \ -<<<<<<< HEAD bridge/jni/v8/JavaNPObjectV8.cpp -======= - bridge/jni/v8/JavaNPObject.cpp ->>>>>>> webkit.org at r54340 diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index c738ee0..db4c515 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= 2010-02-04 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Xan Lopez. @@ -1309,7 +1307,6 @@ (WebCore::IntPoint::IntPoint): (WebCore::IntPoint::operator AEEPoint): ->>>>>>> webkit.org at r54340 2010-02-02 Steve Block <steveblock@google.com> Reviewed by Adam Barth. @@ -1323,8 +1320,6 @@ (WebCore::AbstractWeakReferenceMap::~AbstractWeakReferenceMap): Added. (WebCore::AbstractWeakReferenceMap::Visitor::~Visitor): Added. -<<<<<<< HEAD -======= 2010-02-02 Avi Drissman <avi@chromium.org> Reviewed by Eric Seidel. @@ -2277,7 +2272,6 @@ (WebCore::RenderMathMLBlock::paint): * mathml/RenderMathMLBlock.h: ->>>>>>> webkit.org at r54340 2010-02-01 Philippe Normand <pnormand@igalia.com> Rubber stamped by Xan Lopez. diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index e54897e..f4b8b02 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -1120,8 +1120,6 @@ 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5913953B110758450083EC55 /* JNIBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 5913953A110758450083EC55 /* JNIBridge.h */; }; 5913953D1107584E0083EC55 /* JNIBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5913953C1107584E0083EC55 /* JNIBridge.cpp */; }; - 599ABBC51119761C0083897F /* GeolocationPositionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 599ABBC41119761C0083897F /* GeolocationPositionCache.cpp */; }; - 599ABBC91119762B0083897F /* GeolocationPositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 599ABBC81119762B0083897F /* GeolocationPositionCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; 599E759011055A1F00D904FA /* Bridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 599E758F11055A1F00D904FA /* Bridge.h */; settings = {ATTRIBUTES = (Private, ); }; }; 59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */; }; 59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */; }; @@ -6516,8 +6514,6 @@ 550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 5913953A110758450083EC55 /* JNIBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JNIBridge.h; sourceTree = "<group>"; }; 5913953C1107584E0083EC55 /* JNIBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JNIBridge.cpp; sourceTree = "<group>"; }; - 599ABBC41119761C0083897F /* GeolocationPositionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationPositionCache.cpp; sourceTree = "<group>"; }; - 599ABBC81119762B0083897F /* GeolocationPositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPositionCache.h; sourceTree = "<group>"; }; 599E758F11055A1F00D904FA /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bridge.h; path = bridge/Bridge.h; sourceTree = "<group>"; }; 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaInstanceJSC.cpp; path = jsc/JavaInstanceJSC.cpp; sourceTree = "<group>"; }; 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaInstanceJSC.h; path = jsc/JavaInstanceJSC.h; sourceTree = "<group>"; }; @@ -11412,8 +11408,6 @@ 65BF02180974806300C43196 /* page */ = { isa = PBXGroup; children = ( - 599ABBC81119762B0083897F /* GeolocationPositionCache.h */, - 599ABBC41119761C0083897F /* GeolocationPositionCache.cpp */, 316FE1060E6E1D8400BF6088 /* animation */, 93C09A820B064F05005ABD4D /* mac */, 8538F0000AD71770006A81D1 /* AbstractView.idl */, @@ -18507,14 +18501,10 @@ E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */, F3644B001119805900E0D537 /* InjectedScript.h in Headers */, 97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */, -<<<<<<< HEAD - 599ABBC91119762B0083897F /* GeolocationPositionCache.h in Headers */, -======= 84D0C4061115F1EA0018AA34 /* AffineTransform.h in Headers */, B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */, 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */, 9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */, ->>>>>>> webkit.org at r54340 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -20690,13 +20680,9 @@ 93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */, E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */, 97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */, -<<<<<<< HEAD - 599ABBC51119761C0083897F /* GeolocationPositionCache.cpp in Sources */, -======= 84D0C4041115F1D40018AA34 /* AffineTransform.cpp in Sources */, B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */, 9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */, ->>>>>>> webkit.org at r54340 ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index fd0edc5..a715160 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -349,369 +349,7 @@ bool V8DOMWrapper::isWrapperOfType(v8::Handle<v8::Value> value, V8ClassIndex::V8 return V8ClassIndex::FromInt(type->Int32Value()) == classType; } -<<<<<<< HEAD -#if ENABLE(VIDEO) -#define FOR_EACH_VIDEO_TAG(macro) \ - macro(audio, AUDIO) \ - macro(source, SOURCE) \ - macro(video, VIDEO) -#else -#define FOR_EACH_VIDEO_TAG(macro) -#endif - -#if ENABLE(DATAGRID) -#define FOR_EACH_DATAGRID_TAG(macro) \ - macro(datagrid, DATAGRID) \ - macro(dcell, DATAGRIDCELL) \ - macro(dcol, DATAGRIDCOL) \ - macro(drow, DATAGRIDROW) -#else -#define FOR_EACH_DATAGRID_TAG(macro) -#endif - -#define FOR_EACH_TAG(macro) \ - FOR_EACH_DATAGRID_TAG(macro) \ - macro(a, ANCHOR) \ - macro(applet, APPLET) \ - macro(area, AREA) \ - macro(base, BASE) \ - macro(basefont, BASEFONT) \ - macro(blockquote, BLOCKQUOTE) \ - macro(body, BODY) \ - macro(br, BR) \ - macro(button, BUTTON) \ - macro(caption, TABLECAPTION) \ - macro(col, TABLECOL) \ - macro(colgroup, TABLECOL) \ - macro(del, MOD) \ - macro(canvas, CANVAS) \ - macro(dir, DIRECTORY) \ - macro(div, DIV) \ - macro(dl, DLIST) \ - macro(embed, EMBED) \ - macro(fieldset, FIELDSET) \ - macro(font, FONT) \ - macro(form, FORM) \ - macro(frame, FRAME) \ - macro(frameset, FRAMESET) \ - macro(h1, HEADING) \ - macro(h2, HEADING) \ - macro(h3, HEADING) \ - macro(h4, HEADING) \ - macro(h5, HEADING) \ - macro(h6, HEADING) \ - macro(head, HEAD) \ - macro(hr, HR) \ - macro(html, HTML) \ - macro(img, IMAGE) \ - macro(iframe, IFRAME) \ - macro(image, IMAGE) \ - macro(input, INPUT) \ - macro(ins, MOD) \ - macro(isindex, ISINDEX) \ - macro(keygen, SELECT) \ - macro(label, LABEL) \ - macro(legend, LEGEND) \ - macro(li, LI) \ - macro(link, LINK) \ - macro(listing, PRE) \ - macro(map, MAP) \ - macro(marquee, MARQUEE) \ - macro(menu, MENU) \ - macro(meta, META) \ - macro(object, OBJECT) \ - macro(ol, OLIST) \ - macro(optgroup, OPTGROUP) \ - macro(option, OPTION) \ - macro(p, PARAGRAPH) \ - macro(param, PARAM) \ - macro(pre, PRE) \ - macro(q, QUOTE) \ - macro(script, SCRIPT) \ - macro(select, SELECT) \ - macro(style, STYLE) \ - macro(table, TABLE) \ - macro(thead, TABLESECTION) \ - macro(tbody, TABLESECTION) \ - macro(tfoot, TABLESECTION) \ - macro(td, TABLECELL) \ - macro(th, TABLECELL) \ - macro(tr, TABLEROW) \ - macro(textarea, TEXTAREA) \ - macro(title, TITLE) \ - macro(ul, ULIST) \ - macro(xmp, PRE) - -V8ClassIndex::V8WrapperType V8DOMWrapper::htmlElementType(HTMLElement* element) -{ - typedef HashMap<String, V8ClassIndex::V8WrapperType> WrapperTypeMap; - DEFINE_STATIC_LOCAL(WrapperTypeMap, wrapperTypeMap, ()); - if (wrapperTypeMap.isEmpty()) { -#define ADD_TO_HASH_MAP(tag, name) \ - wrapperTypeMap.set(#tag, V8ClassIndex::HTML##name##ELEMENT); - FOR_EACH_TAG(ADD_TO_HASH_MAP) -#if ENABLE(VIDEO) - if (MediaPlayer::isAvailable()) { - FOR_EACH_VIDEO_TAG(ADD_TO_HASH_MAP) - } -#endif -#undef ADD_TO_HASH_MAP - } - - V8ClassIndex::V8WrapperType type = wrapperTypeMap.get(element->localName().impl()); - if (!type) - return V8ClassIndex::HTMLELEMENT; - return type; -} -#undef FOR_EACH_TAG - -#if ENABLE(SVG) - -#if ENABLE(SVG_ANIMATION) -#define FOR_EACH_ANIMATION_TAG(macro) \ - macro(animateColor, ANIMATECOLOR) \ - macro(animate, ANIMATE) \ - macro(animateTransform, ANIMATETRANSFORM) \ - macro(set, SET) -#else -#define FOR_EACH_ANIMATION_TAG(macro) -#endif - -#if ENABLE(SVG) && ENABLE(FILTERS) -#define FOR_EACH_FILTERS_TAG(macro) \ - macro(feBlend, FEBLEND) \ - macro(feColorMatrix, FECOLORMATRIX) \ - macro(feComponentTransfer, FECOMPONENTTRANSFER) \ - macro(feComposite, FECOMPOSITE) \ - macro(feDiffuseLighting, FEDIFFUSELIGHTING) \ - macro(feDisplacementMap, FEDISPLACEMENTMAP) \ - macro(feDistantLight, FEDISTANTLIGHT) \ - macro(feFlood, FEFLOOD) \ - macro(feFuncA, FEFUNCA) \ - macro(feFuncB, FEFUNCB) \ - macro(feFuncG, FEFUNCG) \ - macro(feFuncR, FEFUNCR) \ - macro(feGaussianBlur, FEGAUSSIANBLUR) \ - macro(feImage, FEIMAGE) \ - macro(feMerge, FEMERGE) \ - macro(feMergeNode, FEMERGENODE) \ - macro(feMorphology, FEMORPHOLOGY) \ - macro(feOffset, FEOFFSET) \ - macro(fePointLight, FEPOINTLIGHT) \ - macro(feSpecularLighting, FESPECULARLIGHTING) \ - macro(feSpotLight, FESPOTLIGHT) \ - macro(feTile, FETILE) \ - macro(feTurbulence, FETURBULENCE) \ - macro(filter, FILTER) -#else -#define FOR_EACH_FILTERS_TAG(macro) -#endif - -#if ENABLE(SVG_FONTS) -#define FOR_EACH_FONTS_TAG(macro) \ - macro(font-face, FONTFACE) \ - macro(font-face-format, FONTFACEFORMAT) \ - macro(font-face-name, FONTFACENAME) \ - macro(font-face-src, FONTFACESRC) \ - macro(font-face-uri, FONTFACEURI) -#else -#define FOR_EACH_FONTS_TAG(marco) -#endif - -#if ENABLE(SVG_FOREIGN_OBJECT) -#define FOR_EACH_FOREIGN_OBJECT_TAG(macro) \ - macro(foreignObject, FOREIGNOBJECT) -#else -#define FOR_EACH_FOREIGN_OBJECT_TAG(macro) -#endif - -#if ENABLE(SVG_USE) -#define FOR_EACH_USE_TAG(macro) \ - macro(use, USE) -#else -#define FOR_EACH_USE_TAG(macro) -#endif - -#define FOR_EACH_TAG(macro) \ - FOR_EACH_ANIMATION_TAG(macro) \ - FOR_EACH_FILTERS_TAG(macro) \ - FOR_EACH_FONTS_TAG(macro) \ - FOR_EACH_FOREIGN_OBJECT_TAG(macro) \ - FOR_EACH_USE_TAG(macro) \ - macro(a, A) \ - macro(altGlyph, ALTGLYPH) \ - macro(circle, CIRCLE) \ - macro(clipPath, CLIPPATH) \ - macro(cursor, CURSOR) \ - macro(defs, DEFS) \ - macro(desc, DESC) \ - macro(ellipse, ELLIPSE) \ - macro(g, G) \ - macro(glyph, GLYPH) \ - macro(image, IMAGE) \ - macro(linearGradient, LINEARGRADIENT) \ - macro(line, LINE) \ - macro(marker, MARKER) \ - macro(mask, MASK) \ - macro(metadata, METADATA) \ - macro(path, PATH) \ - macro(pattern, PATTERN) \ - macro(polyline, POLYLINE) \ - macro(polygon, POLYGON) \ - macro(radialGradient, RADIALGRADIENT) \ - macro(rect, RECT) \ - macro(script, SCRIPT) \ - macro(stop, STOP) \ - macro(style, STYLE) \ - macro(svg, SVG) \ - macro(switch, SWITCH) \ - macro(symbol, SYMBOL) \ - macro(text, TEXT) \ - macro(textPath, TEXTPATH) \ - macro(title, TITLE) \ - macro(tref, TREF) \ - macro(tspan, TSPAN) \ - macro(view, VIEW) \ - // end of macro - -V8ClassIndex::V8WrapperType V8DOMWrapper::svgElementType(SVGElement* element) -{ - typedef HashMap<String, V8ClassIndex::V8WrapperType> WrapperTypeMap; - DEFINE_STATIC_LOCAL(WrapperTypeMap, wrapperTypeMap, ()); - if (wrapperTypeMap.isEmpty()) { -#define ADD_TO_HASH_MAP(tag, name) \ - wrapperTypeMap.set(#tag, V8ClassIndex::SVG##name##ELEMENT); - FOR_EACH_TAG(ADD_TO_HASH_MAP) -#undef ADD_TO_HASH_MAP - } - - V8ClassIndex::V8WrapperType type = wrapperTypeMap.get(element->localName().impl()); - if (!type) - return V8ClassIndex::SVGELEMENT; - return type; -} -#undef FOR_EACH_TAG - -#endif // ENABLE(SVG) - -v8::Handle<v8::Value> V8DOMWrapper::convertEventToV8Object(Event* event) -{ - if (!event) - return v8::Null(); - - v8::Handle<v8::Object> wrapper = getDOMObjectMap().get(event); - if (!wrapper.IsEmpty()) - return wrapper; - - V8ClassIndex::V8WrapperType type = V8ClassIndex::EVENT; - - if (event->isUIEvent()) { - if (event->isKeyboardEvent()) - type = V8ClassIndex::KEYBOARDEVENT; - else if (event->isTextEvent()) - type = V8ClassIndex::TEXTEVENT; - else if (event->isMouseEvent()) - type = V8ClassIndex::MOUSEEVENT; - else if (event->isWheelEvent()) - type = V8ClassIndex::WHEELEVENT; -// ANDROID: Upstream TOUCH_EVENTS. -#if ENABLE(TOUCH_EVENTS) - else if (event->isTouchEvent()) - type = V8ClassIndex::TOUCHEVENT; -#endif -#if ENABLE(SVG) - else if (event->isSVGZoomEvent()) - type = V8ClassIndex::SVGZOOMEVENT; -#endif - else if (event->isCompositionEvent()) - type = V8ClassIndex::COMPOSITIONEVENT; - else - type = V8ClassIndex::UIEVENT; - } else if (event->isMutationEvent()) - type = V8ClassIndex::MUTATIONEVENT; - else if (event->isOverflowEvent()) - type = V8ClassIndex::OVERFLOWEVENT; - else if (event->isMessageEvent()) - type = V8ClassIndex::MESSAGEEVENT; - else if (event->isPageTransitionEvent()) - type = V8ClassIndex::PAGETRANSITIONEVENT; - else if (event->isPopStateEvent()) - type = V8ClassIndex::POPSTATEEVENT; - else if (event->isProgressEvent()) { - if (event->isXMLHttpRequestProgressEvent()) - type = V8ClassIndex::XMLHTTPREQUESTPROGRESSEVENT; - else - type = V8ClassIndex::PROGRESSEVENT; - } else if (event->isWebKitAnimationEvent()) - type = V8ClassIndex::WEBKITANIMATIONEVENT; - else if (event->isWebKitTransitionEvent()) - type = V8ClassIndex::WEBKITTRANSITIONEVENT; -#if ENABLE(WORKERS) - else if (event->isErrorEvent()) - type = V8ClassIndex::ERROREVENT; -#endif -#if ENABLE(DOM_STORAGE) - else if (event->isStorageEvent()) - type = V8ClassIndex::STORAGEEVENT; -#endif - else if (event->isBeforeLoadEvent()) - type = V8ClassIndex::BEFORELOADEVENT; - - - v8::Handle<v8::Object> result = instantiateV8Object(type, V8ClassIndex::EVENT, event); - if (result.IsEmpty()) { - // Instantiation failed. Avoid updating the DOM object map and - // return null which is already handled by callers of this function - // in case the event is NULL. - return v8::Null(); - } - - event->ref(); // fast ref - setJSWrapperForDOMObject(event, v8::Persistent<v8::Object>::New(result)); - - return result; -} - -static const V8ClassIndex::V8WrapperType mapping[] = { - V8ClassIndex::INVALID_CLASS_INDEX, // NONE - V8ClassIndex::INVALID_CLASS_INDEX, // ELEMENT_NODE needs special treatment - V8ClassIndex::ATTR, // ATTRIBUTE_NODE - V8ClassIndex::TEXT, // TEXT_NODE - V8ClassIndex::CDATASECTION, // CDATA_SECTION_NODE - V8ClassIndex::ENTITYREFERENCE, // ENTITY_REFERENCE_NODE - V8ClassIndex::ENTITY, // ENTITY_NODE - V8ClassIndex::PROCESSINGINSTRUCTION, // PROCESSING_INSTRUCTION_NODE - V8ClassIndex::COMMENT, // COMMENT_NODE - V8ClassIndex::INVALID_CLASS_INDEX, // DOCUMENT_NODE needs special treatment - V8ClassIndex::DOCUMENTTYPE, // DOCUMENT_TYPE_NODE - V8ClassIndex::DOCUMENTFRAGMENT, // DOCUMENT_FRAGMENT_NODE - V8ClassIndex::NOTATION, // NOTATION_NODE - V8ClassIndex::NODE, // XPATH_NAMESPACE_NODE -}; - -v8::Handle<v8::Value> V8DOMWrapper::convertDocumentToV8Object(Document* document) -{ - // Find a proxy for this node. - // - // Note that if proxy is found, we might initialize the context which can - // instantiate a document wrapper. Therefore, we get the proxy before - // checking if the node already has a wrapper. - V8Proxy* proxy = V8Proxy::retrieve(document->frame()); - if (proxy) - proxy->windowShell()->initContextIfNeeded(); - - DOMNodeMapping& domNodeMap = getDOMNodeMap(); - v8::Handle<v8::Object> wrapper = domNodeMap.get(document); - if (wrapper.IsEmpty()) - return convertNewNodeToV8Object(document, proxy, domNodeMap); - - return wrapper; -} - -static v8::Handle<v8::Value> getWrapper(Node* node) -======= v8::Handle<v8::Object> V8DOMWrapper::getWrapper(Node* node) ->>>>>>> webkit.org at r54340 { ASSERT(WTF::isMainThread()); V8IsolatedContext* context = V8IsolatedContext::getEntered(); diff --git a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp index d8dde7a..bc8300c 100644 --- a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp @@ -46,14 +46,12 @@ #include "V8IsolatedContext.h" #include "V8Node.h" #include "V8Proxy.h" -<<<<<<< HEAD +#include "V8SVGDocument.h" +#include "V8WebGLRenderingContext.h" + // ANDROID // TODO: Upstream to webkit.org #if ENABLE(XPATH) -======= -#include "V8SVGDocument.h" -#include "V8WebGLRenderingContext.h" ->>>>>>> webkit.org at r54340 #include "V8XPathNSResolver.h" #include "V8XPathResult.h" #endif diff --git a/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp b/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp index 22e84c9..828d1bc 100644 --- a/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp +++ b/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp @@ -33,17 +33,13 @@ #include "ExceptionCode.h" #include "RuntimeEnabledFeatures.h" -<<<<<<< HEAD -#include "V8Binding.h" -#include "V8Proxy.h" +#include "V8DOMWindow.h" +#include "V8DOMWrapper.h" #if PLATFORM(ANDROID) #include "V8CustomApplicationInstalledCallback.h" +#include "V8Proxy.h" #endif -======= -#include "V8DOMWindow.h" -#include "V8DOMWrapper.h" ->>>>>>> webkit.org at r54340 namespace WebCore { @@ -54,7 +50,19 @@ bool V8Navigator::GeolocationEnabled() } #endif -<<<<<<< HEAD +v8::Handle<v8::Value> toV8(Navigator* impl) +{ + if (!impl) + return v8::Null(); + v8::Handle<v8::Object> wrapper = getDOMObjectMap().get(impl); + if (wrapper.IsEmpty()) { + wrapper = V8Navigator::wrap(impl); + if (!wrapper.IsEmpty()) + V8DOMWrapper::setHiddenWindowReference(impl->frame(), V8DOMWindow::navigatorIndex, wrapper); + } + return wrapper; +} + #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) static PassRefPtr<ApplicationInstalledCallback> createApplicationInstalledCallback( @@ -99,19 +107,4 @@ v8::Handle<v8::Value> V8Navigator::isApplicationInstalledCallback(const v8::Argu #endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) -======= -v8::Handle<v8::Value> toV8(Navigator* impl) -{ - if (!impl) - return v8::Null(); - v8::Handle<v8::Object> wrapper = getDOMObjectMap().get(impl); - if (wrapper.IsEmpty()) { - wrapper = V8Navigator::wrap(impl); - if (!wrapper.IsEmpty()) - V8DOMWrapper::setHiddenWindowReference(impl->frame(), V8DOMWindow::navigatorIndex, wrapper); - } - return wrapper; -} - ->>>>>>> webkit.org at r54340 } // namespace WebCore diff --git a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp index 1944108..9352983 100644 --- a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp +++ b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp @@ -134,15 +134,9 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja case float_type: { if (type == NPVariantType_Int32) -<<<<<<< HEAD result.f = static_cast<jfloat>(NPVARIANT_TO_INT32(value)); else if (type == NPVariantType_Double) result.f = static_cast<jfloat>(NPVARIANT_TO_DOUBLE(value)); -======= - result.j = static_cast<jfloat>(NPVARIANT_TO_INT32(value)); - else if (type == NPVariantType_Double) - result.j = static_cast<jfloat>(NPVARIANT_TO_DOUBLE(value)); ->>>>>>> webkit.org at r54340 else bzero(&result, sizeof(jvalue)); } @@ -151,15 +145,9 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja case double_type: { if (type == NPVariantType_Int32) -<<<<<<< HEAD result.d = static_cast<jdouble>(NPVARIANT_TO_INT32(value)); else if (type == NPVariantType_Double) result.d = static_cast<jdouble>(NPVARIANT_TO_DOUBLE(value)); -======= - result.j = static_cast<jdouble>(NPVARIANT_TO_INT32(value)); - else if (type == NPVariantType_Double) - result.j = static_cast<jdouble>(NPVARIANT_TO_DOUBLE(value)); ->>>>>>> webkit.org at r54340 else bzero(&result, sizeof(jvalue)); } |