Title: [102372] branches/safari-534.53-branch
- Revision
- 102372
- Author
- lforsch...@apple.com
- Date
- 2011-12-08 13:06:08 -0800 (Thu, 08 Dec 2011)
Log Message
Merged r101532.
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102371 => 102372)
--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-08 21:05:38 UTC (rev 102371)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-08 21:06:08 UTC (rev 102372)
@@ -1,5 +1,22 @@
2011-12-08 Lucas Forschler <lforsch...@apple.com>
+ Merge 101532
+
+ 2011-11-29 Beth Dakin <bda...@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-12-08 Lucas Forschler <lforsch...@apple.com>
+
Merge 101290
2011-11-28 Beth Dakin <bda...@apple.com>
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (102371 => 102372)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-12-08 21:05:38 UTC (rev 102371)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-12-08 21:06:08 UTC (rev 102372)
@@ -1084,7 +1084,7 @@
if (!handled) {
CurrentEvent currentEvent(mouseEvent);
- handled = handleMouseEvent(mouseEvent, m_page.get(), !windowIsFocused());
+ handled = handleMouseEvent(mouseEvent, m_page.get(), !m_page->focusController()->isActive());
}
send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled));
Modified: branches/safari-534.53-branch/Tools/ChangeLog (102371 => 102372)
--- branches/safari-534.53-branch/Tools/ChangeLog 2011-12-08 21:05:38 UTC (rev 102371)
+++ branches/safari-534.53-branch/Tools/ChangeLog 2011-12-08 21:06:08 UTC (rev 102372)
@@ -1,3 +1,19 @@
+2011-12-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 101532
+
+ 2011-11-29 Beth Dakin <bda...@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-12-06 Lucas Forschler <lforsch...@apple.com>
Merge 98413
Modified: branches/safari-534.53-branch/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm (102371 => 102372)
--- branches/safari-534.53-branch/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2011-12-08 21:05:38 UTC (rev 102371)
+++ branches/safari-534.53-branch/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2011-12-08 21:06:08 UTC (rev 102372)
@@ -27,6 +27,16 @@
#import <Carbon/Carbon.h>
+@interface ActiveOffscreenWindow : NSWindow
+@end
+
+@implementation ActiveOffscreenWindow
+- (BOOL)isKeyWindow
+{
+ return YES;
+}
+@end
+
namespace TestWebKitAPI {
PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
@@ -35,7 +45,7 @@
m_view = [[WKView alloc] initWithFrame:rect contextRef:contextRef pageGroupRef:pageGroupRef];
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];
[m_window orderBack:nil];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
