Title: [210481] trunk/Tools
- Revision
- 210481
- Author
- [email protected]
- Date
- 2017-01-07 13:08:43 -0800 (Sat, 07 Jan 2017)
Log Message
Share the implementation of MiniBrowser view hiding functionality
https://bugs.webkit.org/show_bug.cgi?id=166800
Reviewed by Andy Estes.
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController showHideWebView:]):
(-[BrowserWindowController removeReinsertWebView:]):
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController showHideWebView:]): Deleted.
(-[WK1BrowserWindowController removeReinsertWebView:]): Deleted.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController showHideWebView:]): Deleted.
(-[WK2BrowserWindowController removeReinsertWebView:]): Deleted.
Move the implementation of these two things to the shared superclass,
since they don't depend on WebKit-specific things.
Also, there was no reason to retain the (WK)WebView while it was unparented,
as the BrowserWindowController maintains a reference the entire time.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (210480 => 210481)
--- trunk/Tools/ChangeLog 2017-01-07 21:00:30 UTC (rev 210480)
+++ trunk/Tools/ChangeLog 2017-01-07 21:08:43 UTC (rev 210481)
@@ -1,3 +1,24 @@
+2017-01-07 Tim Horton <[email protected]>
+
+ Share the implementation of MiniBrowser view hiding functionality
+ https://bugs.webkit.org/show_bug.cgi?id=166800
+
+ Reviewed by Andy Estes.
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController showHideWebView:]):
+ (-[BrowserWindowController removeReinsertWebView:]):
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController showHideWebView:]): Deleted.
+ (-[WK1BrowserWindowController removeReinsertWebView:]): Deleted.
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController showHideWebView:]): Deleted.
+ (-[WK2BrowserWindowController removeReinsertWebView:]): Deleted.
+ Move the implementation of these two things to the shared superclass,
+ since they don't depend on WebKit-specific things.
+ Also, there was no reason to retain the (WK)WebView while it was unparented,
+ as the BrowserWindowController maintains a reference the entire time.
+
2017-01-06 Andy Estes <[email protected]>
[Cocoa] Consolidate duplicate copies of WebArchiveDumpSupport in DRT and WKTR into WebCoreTestSupport
Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (210480 => 210481)
--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2017-01-07 21:00:30 UTC (rev 210480)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2017-01-07 21:08:43 UTC (rev 210481)
@@ -111,12 +111,15 @@
- (IBAction)showHideWebView:(id)sender
{
- [self doesNotRecognizeSelector:_cmd];
+ self.mainContentView.hidden = !self.mainContentView.isHidden;
}
- (IBAction)removeReinsertWebView:(id)sender
{
- [self doesNotRecognizeSelector:_cmd];
+ if (self.mainContentView.window)
+ [self.mainContentView removeFromSuperview];
+ else
+ [containerView addSubview:self.mainContentView];
}
- (IBAction)zoomIn:(id)sender
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (210480 => 210481)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-01-07 21:00:30 UTC (rev 210480)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-01-07 21:08:43 UTC (rev 210481)
@@ -86,24 +86,6 @@
[[_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:url]];
}
-- (IBAction)showHideWebView:(id)sender
-{
- BOOL hidden = ![_webView isHidden];
-
- [_webView setHidden:hidden];
-}
-
-- (IBAction)removeReinsertWebView:(id)sender
-{
- if ([_webView window]) {
- [_webView retain];
- [_webView removeFromSuperview];
- } else {
- [containerView addSubview:_webView];
- [_webView release];
- }
-}
-
- (IBAction)setPageScale:(id)sender
{
CGFloat scale = [self pageScaleForMenuItemTag:[sender tag]];
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (210480 => 210481)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-01-07 21:00:30 UTC (rev 210480)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-01-07 21:08:43 UTC (rev 210481)
@@ -124,24 +124,6 @@
[_webView loadRequest:[NSURLRequest requestWithURL:[NSURL _webkit_URLWithUserTypedString:[urlText stringValue]]]];
}
-- (IBAction)showHideWebView:(id)sender
-{
- BOOL hidden = ![_webView isHidden];
-
- [_webView setHidden:hidden];
-}
-
-- (IBAction)removeReinsertWebView:(id)sender
-{
- if ([_webView window]) {
- [_webView retain];
- [_webView removeFromSuperview];
- } else {
- [containerView addSubview:_webView];
- [_webView release];
- }
-}
-
- (IBAction)setPageScale:(id)sender
{
CGFloat scale = [self pageScaleForMenuItemTag:[sender tag]];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
