Changeset 101532 in webkit

Timestamp:

Nov 30, 2011 11:00:37 AM (12 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=72751
WebKit2.MouseMoveAfterCrash API test is failing

Reviewed by Sam Weinig.

Source/WebKit2:

windowIsFocused() is too restrictive. All we need to know is that the page is
active.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::mouseEvent):
(WebKit::WebPage::mouseEventSyncForTesting):

Tools:

Like DumpRenderTree, the NSWindow should act as an active window.

• TestWebKitAPI/mac/PlatformWebViewMac.mm:

(-[ActiveOffscreenWindow isKeyWindow]):
(TestWebKitAPI::PlatformWebView::PlatformWebView):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-29  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=72751
+        WebKit2.MouseMoveAfterCrash API test is failing 
+
+        Reviewed by Sam Weinig.
+
+        windowIsFocused() is too restrictive. All we need to know is that the page is 
+        active.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::mouseEvent):
+        (WebKit::WebPage::mouseEventSyncForTesting):
+
 2011-11-29  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1180 +1180 @@
         CurrentEvent currentEvent(mouseEvent);
 
-        handled = handleMouseEvent(mouseEvent, m_page.get(), !windowIsFocused());
+        handled = handleMouseEvent(mouseEvent, m_page.get(), !m_page->focusController()->isActive());
     }
 
@@ -1198 +1198 @@
     if (!handled) {
         CurrentEvent currentEvent(mouseEvent);
-        handled = handleMouseEvent(mouseEvent, m_page.get(), !windowIsFocused());
+        handled = handleMouseEvent(mouseEvent, m_page.get(), !m_page->focusController()->isActive());
     }
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-29  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=72751
+        WebKit2.MouseMoveAfterCrash API test is failing 
+
+        Reviewed by Sam Weinig.
+
+        Like DumpRenderTree, the NSWindow should act as an active window.
+        * TestWebKitAPI/mac/PlatformWebViewMac.mm:
+        (-[ActiveOffscreenWindow isKeyWindow]):
+        (TestWebKitAPI::PlatformWebView::PlatformWebView):
+
 2011-11-30  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm

@@ -30 +30 @@
 #import <Carbon/Carbon.h>
 
+@interface ActiveOffscreenWindow : NSWindow
+@end
+
+@implementation ActiveOffscreenWindow
+- (BOOL)isKeyWindow
+{
+    return YES;
+}
+@end
+
 namespace TestWebKitAPI {
 
@@ -38 +48 @@
 
     NSRect windowRect = NSOffsetRect(rect, -10000, [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000);
-    m_window = [[NSWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
+    m_window = [[ActiveOffscreenWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
     [m_window setColorSpace:[[NSScreen mainScreen] colorSpace]];
     [[m_window contentView] addSubview:m_view];