Title: [171399] branches/safari-600.1-branch/Tools
- Revision
- 171399
- Author
- dburk...@apple.com
- Date
- 2014-07-22 22:09:52 -0700 (Tue, 22 Jul 2014)
Log Message
Merge r171199
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Tools/ChangeLog (171398 => 171399)
--- branches/safari-600.1-branch/Tools/ChangeLog 2014-07-23 05:07:34 UTC (rev 171398)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-07-23 05:09:52 UTC (rev 171399)
@@ -1,3 +1,15 @@
+2014-07-22 Dana Burkart <dburk...@apple.com>
+
+ Merge r171199.
+
+ 2014-07-17 Sam Weinig <s...@webkit.org>
+
+ Fix failing API tests.
+
+ * TestWebKitAPI/mac/PlatformWebViewMac.mm:
+ (-[ActiveOffscreenWindow isVisible]):
+ Override isVisible to make the NSWindows pretend they are visible.
+
2014-07-17 Lucas Forschler <lforsch...@apple.com>
Rollout r171167. <rdar://problem/17716602>
Modified: branches/safari-600.1-branch/Tools/MiniBrowser/mac/BrowserWindowController.m (171398 => 171399)
--- branches/safari-600.1-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2014-07-23 05:07:34 UTC (rev 171398)
+++ branches/safari-600.1-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2014-07-23 05:09:52 UTC (rev 171399)
@@ -42,6 +42,7 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
self.window.styleMask |= NSFullSizeContentViewWindowMask;
#endif
+ [self.window.contentView setWantsLayer:YES];
[super windowDidLoad];
}
Modified: branches/safari-600.1-branch/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm (171398 => 171399)
--- branches/safari-600.1-branch/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2014-07-23 05:07:34 UTC (rev 171398)
+++ branches/safari-600.1-branch/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2014-07-23 05:09:52 UTC (rev 171399)
@@ -37,6 +37,10 @@
{
return YES;
}
+- (BOOL)isVisible
+{
+ return YES;
+}
@end
namespace TestWebKitAPI {
@@ -45,6 +49,7 @@
{
NSRect rect = NSMakeRect(0, 0, 800, 600);
m_view = [[WKView alloc] initWithFrame:rect contextRef:contextRef pageGroupRef:pageGroupRef];
+ [m_view setWindowOcclusionDetectionEnabled:NO];
NSRect windowRect = NSOffsetRect(rect, -10000, [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000);
m_window = [[ActiveOffscreenWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
@@ -67,7 +72,6 @@
[m_view setFrame:NSMakeRect(0, 0, width, height)];
}
-
WKPageRef PlatformWebView::page() const
{
return [m_view pageRef];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
