Changeset 182821 in webkit

Timestamp:

Apr 14, 2015 4:48:00 PM (9 years ago)

Author:

Brent Fulgham

Message:

Correct layering violation in DumpRenderTree Build
​https://bugs.webkit.org/show_bug.cgi?id=143732

Reviewed by Simon Fraser.

Source/WebCore:

• testing/js/WebCoreTestSupport.cpp:

(WebCoreTestSupport::monitorWheelEvents): Added. Provides a wrapper around
the internal WebCore objects needed to implement this function.
(WebCoreTestSupport::setTestCallbackAndStartNotificationTimer): Ditto.

• testing/js/WebCoreTestSupport.h:

Tools:

Correct a layering violation in DumpRenderTree by calling functions on the
WebCoreTestSupport library, rather than attempting to work with WebCore
types directly.

• DumpRenderTree/mac/EventSendingController.mm:

(-[EventSendingController monitorWheelEvents]): Call methods on WebCoreTestSupport, rather
than WebCore itself.,
(-[EventSendingController callAfterScrollingCompletes:]): Ditto.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/testing/js/WebCoreTestSupport.cpp (modified) (2 diffs)
• Source/WebCore/testing/js/WebCoreTestSupport.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/EventSendingController.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-14  Brent Fulgham  <bfulgham@apple.com>
+
+        Correct layering violation in DumpRenderTree Build
+        https://bugs.webkit.org/show_bug.cgi?id=143732
+
+        Reviewed by Simon Fraser.
+
+        * testing/js/WebCoreTestSupport.cpp:
+        (WebCoreTestSupport::monitorWheelEvents): Added. Provides a wrapper around
+        the internal WebCore objects needed to implement this function.
+        (WebCoreTestSupport::setTestCallbackAndStartNotificationTimer): Ditto.
+        * testing/js/WebCoreTestSupport.h:
+
 2015-04-14  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp

@@ -32 +32 @@
 #include "JSDocument.h"
 #include "JSInternals.h"
+#include "MainFrame.h"
+#include "WheelEventTestTrigger.h"
 #include <JavaScriptCore/APICast.h>
+#include <JavaScriptCore/JSValueRef.h>
 #include <JavaScriptCore/Profile.h>
 #include <interpreter/CallFrame.h>
@@ -63 +66 @@
 }
 
+void monitorWheelEvents(WebCore::Frame& frame)
+{
+    frame.mainFrame().ensureTestTrigger();
 }
+
+void setTestCallbackAndStartNotificationTimer(WebCore::Frame& frame, JSContextRef context, JSObjectRef jsCallbackFunction)
+{
+    WheelEventTestTrigger* trigger = frame.mainFrame().ensureTestTrigger();
+    JSValueProtect(context, jsCallbackFunction);
+    
+    trigger->setTestCallbackAndStartNotificationTimer([=](void) {
+        JSObjectCallAsFunction(context, jsCallbackFunction, nullptr, 0, nullptr, nullptr);
+        JSValueUnprotect(context, jsCallbackFunction);
+    });
+}
+
+}

trunk/Source/WebCore/testing/js/WebCoreTestSupport.h

@@ -28 +28 @@
 
 typedef const struct OpaqueJSContext* JSContextRef;
+typedef struct OpaqueJSValue* JSObjectRef;
 
 #if PLATFORM(COCOA)
@@ -35 +36 @@
 #endif
 
+namespace WebCore {
+class Frame;
+}
+
 namespace WebCoreTestSupport {
 
 void injectInternalsObject(JSContextRef) TEST_SUPPORT_EXPORT;
 void resetInternalsObject(JSContextRef) TEST_SUPPORT_EXPORT;
+void monitorWheelEvents(WebCore::Frame&) TEST_SUPPORT_EXPORT;
+void setTestCallbackAndStartNotificationTimer(WebCore::Frame&, JSContextRef, JSObjectRef) TEST_SUPPORT_EXPORT;
 
 } // namespace WebCore

trunk/Tools/ChangeLog

@@ +1 @@
+2015-04-14  Brent Fulgham  <bfulgham@apple.com>
+
+        Correct layering violation in DumpRenderTree Build
+        https://bugs.webkit.org/show_bug.cgi?id=143732
+
+        Reviewed by Simon Fraser.
+
+        Correct a layering violation in DumpRenderTree by calling functions on the
+        WebCoreTestSupport library, rather than attempting to work with WebCore
+        types directly.
+
+        * DumpRenderTree/mac/EventSendingController.mm:
+        (-[EventSendingController monitorWheelEvents]): Call methods on WebCoreTestSupport, rather
+        than WebCore itself.,
+        (-[EventSendingController callAfterScrollingCompletes:]): Ditto.
+
 2015-04-14  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Tools/DumpRenderTree/mac/EventSendingController.mm

@@ -36 +36 @@
 #import "DumpRenderTreeDraggingInfo.h"
 #import "DumpRenderTreeFileDraggingSource.h"
+#import "WebCoreTestSupport.h"
 #import <WebKit/DOMPrivate.h>
 #import <WebKit/WebKit.h>
@@ -43 +44 @@
 #if !PLATFORM(IOS)
 #import <Carbon/Carbon.h> // for GetCurrentEventTime()
-#import <JavaScriptCore/JSRetainPtr.h>
-#import <WebCore/MainFrame.h>
-#import <WebCore/Page.h>
-#import <WebCore/WheelEventTestTrigger.h>
 #endif
 
@@ -1268 +1265 @@
     if (!frame)
         return;
-    
-    frame->mainFrame().ensureTestTrigger();
+
+    WebCoreTestSupport::monitorWheelEvents(*frame);
 #endif
 }
@@ -1284 +1281 @@
         return;
 
-    WebCore::WheelEventTestTrigger* trigger = frame->mainFrame().ensureTestTrigger();
     JSGlobalContextRef globalContext = [mainFrame globalContext];
-    JSValueProtect(globalContext, jsCallbackFunction);
-
-    trigger->setTestCallbackAndStartNotificationTimer([=](void) {
-        JSObjectCallAsFunction(globalContext, jsCallbackFunction, nullptr, 0, nullptr, nullptr);
-        JSValueUnprotect(globalContext, jsCallbackFunction);
-    });
+    WebCoreTestSupport::setTestCallbackAndStartNotificationTimer(*frame, globalContext, jsCallbackFunction);
 #endif
 }