changeset 9351:67a83054f43b

8090292: Test transitions/created-while-suspended.html fails Reviewed-by: azvegint, ghb Contributed-by: arunprasad.rajkumar@oracle.com
author azvegint
date Tue, 03 Nov 2015 18:27:50 +0300
parents 35b74894be20
children 3e5972237348
files modules/web/src/main/native/Source/WebCore/TargetJava.pri modules/web/src/main/native/Source/WebCore/mapfile-macosx modules/web/src/main/native/Source/WebCore/mapfile-vers modules/web/src/main/native/Source/WebCore/testing/js/WebCoreTestSupport.h modules/web/src/main/native/Tools/DumpRenderTree/java/DumpRenderTree.cpp
diffstat 5 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/modules/web/src/main/native/Source/WebCore/TargetJava.pri	Mon Nov 02 09:29:33 2015 -0800
+++ b/modules/web/src/main/native/Source/WebCore/TargetJava.pri	Tue Nov 03 18:27:50 2015 +0300
@@ -474,7 +474,7 @@
     bridge/runtime_method.cpp \
     bridge/runtime_object.cpp \
     bridge/runtime_root.cpp \
-#    testing/js/WebCoreTestSupport.cpp \
+    testing/js/WebCoreTestSupport.cpp \
     Modules/navigatorcontentutils/NavigatorContentUtils.cpp \
     Modules/proximity/DeviceProximityController.cpp \
     Modules/proximity/DeviceProximityEvent.cpp \
--- a/modules/web/src/main/native/Source/WebCore/mapfile-macosx	Mon Nov 02 09:29:33 2015 -0800
+++ b/modules/web/src/main/native/Source/WebCore/mapfile-macosx	Tue Nov 03 18:27:50 2015 +0300
@@ -100,6 +100,7 @@
                __ZN3JSC14setNeverInlineEPK15OpaqueJSContextPK13OpaqueJSValue
                __ZN3JSC19numberOfDFGCompilesEPK15OpaqueJSContextPK13OpaqueJSValue
                __ZN3JSC17JSArrayBufferView6s_infoE
+               __ZN18WebCoreTestSupport21injectInternalsObjectEPK15OpaqueJSContext
                _Java_com_sun_webkit_dom_AttrImpl_getNameImpl
                _Java_com_sun_webkit_dom_AttrImpl_getOwnerElementImpl
                _Java_com_sun_webkit_dom_AttrImpl_getSpecifiedImpl
--- a/modules/web/src/main/native/Source/WebCore/mapfile-vers	Mon Nov 02 09:29:33 2015 -0800
+++ b/modules/web/src/main/native/Source/WebCore/mapfile-vers	Tue Nov 03 18:27:50 2015 +0300
@@ -102,6 +102,7 @@
                _ZN3JSC14setNeverInlineEPK15OpaqueJSContextPK13OpaqueJSValue;
                _ZN3JSC19numberOfDFGCompilesEPK15OpaqueJSContextPK13OpaqueJSValue;
                _ZN3JSC17JSArrayBufferView6s_infoE;
+               _ZN18WebCoreTestSupport21injectInternalsObjectEPK15OpaqueJSContext;
                Java_com_sun_webkit_dom_AttrImpl_getNameImpl;
                Java_com_sun_webkit_dom_AttrImpl_getOwnerElementImpl;
                Java_com_sun_webkit_dom_AttrImpl_getSpecifiedImpl;
--- a/modules/web/src/main/native/Source/WebCore/testing/js/WebCoreTestSupport.h	Mon Nov 02 09:29:33 2015 -0800
+++ b/modules/web/src/main/native/Source/WebCore/testing/js/WebCoreTestSupport.h	Tue Nov 03 18:27:50 2015 +0300
@@ -28,7 +28,7 @@
 
 typedef const struct OpaqueJSContext* JSContextRef;
 
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) || PLATFORM(JAVA)
 #define TEST_SUPPORT_EXPORT WTF_EXPORT_PRIVATE
 #else
 #define TEST_SUPPORT_EXPORT
@@ -36,8 +36,8 @@
 
 namespace WebCoreTestSupport {
 
-void injectInternalsObject(JSContextRef) TEST_SUPPORT_EXPORT;
-void resetInternalsObject(JSContextRef) TEST_SUPPORT_EXPORT;
+TEST_SUPPORT_EXPORT void injectInternalsObject(JSContextRef);
+TEST_SUPPORT_EXPORT void resetInternalsObject(JSContextRef);
 
 } // namespace WebCore
 
--- a/modules/web/src/main/native/Tools/DumpRenderTree/java/DumpRenderTree.cpp	Mon Nov 02 09:29:33 2015 -0800
+++ b/modules/web/src/main/native/Tools/DumpRenderTree/java/DumpRenderTree.cpp	Tue Nov 03 18:27:50 2015 +0300
@@ -7,6 +7,7 @@
 #include "TestRunner.h"
 #include "EventSender.h"
 #include "WorkQueue.h"
+#include "WebCore/testing/js/WebCoreTestSupport.h"
 
 #include <wtf/RefPtr.h>
 #include <API/JavaScript.h>
@@ -40,20 +41,21 @@
     ASSERT(pContext);
     ASSERT(pWindowObject);
     ASSERT(eventSender);
-    
+
     JSGlobalContextRef context =
             static_cast<JSGlobalContextRef>(jlong_to_ptr(pContext));
     JSObjectRef windowObject =
             static_cast<JSObjectRef>(jlong_to_ptr(pWindowObject));
-    
+
     JSValueRef exception = 0;
-    
+
     gTestRunner->makeWindowObject(context, windowObject, &exception);
     ASSERT(!exception);
 
     JLObject jlEventSender(eventSender, true);
     makeEventSender(context, windowObject, jlEventSender, &exception);
     ASSERT(!exception);
+    WebCoreTestSupport::injectInternalsObject(context);
 }
 
 JNIEXPORT void JNICALL Java_com_sun_javafx_webkit_drt_DumpRenderTree_dispose