<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210481] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210481">210481</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-01-07 13:08:43 -0800 (Sat, 07 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210480 => 210481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-07 21:00:30 UTC (rev 210480)
+++ trunk/Tools/ChangeLog 2017-01-07 21:08:43 UTC (rev 210481)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-07 Tim Horton <timothy_horton@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2017-01-06 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Consolidate duplicate copies of WebArchiveDumpSupport in DRT and WKTR into WebCoreTestSupport
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (210480 => 210481)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -111,12 +111,15 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)showHideWebView:(id)sender
</span><span class="cx"> {
</span><del>- [self doesNotRecognizeSelector:_cmd];
</del><ins>+ self.mainContentView.hidden = !self.mainContentView.isHidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)removeReinsertWebView:(id)sender
</span><span class="cx"> {
</span><del>- [self doesNotRecognizeSelector:_cmd];
</del><ins>+ if (self.mainContentView.window)
+ [self.mainContentView removeFromSuperview];
+ else
+ [containerView addSubview:self.mainContentView];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)zoomIn:(id)sender
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (210480 => 210481)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -86,24 +86,6 @@
</span><span class="cx"> [[_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:url]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (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];
- }
-}
-
</del><span class="cx"> - (IBAction)setPageScale:(id)sender
</span><span class="cx"> {
</span><span class="cx"> CGFloat scale = [self pageScaleForMenuItemTag:[sender tag]];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (210480 => 210481)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -124,24 +124,6 @@
</span><span class="cx"> [_webView loadRequest:[NSURLRequest requestWithURL:[NSURL _webkit_URLWithUserTypedString:[urlText stringValue]]]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (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];
- }
-}
-
</del><span class="cx"> - (IBAction)setPageScale:(id)sender
</span><span class="cx"> {
</span><span class="cx"> CGFloat scale = [self pageScaleForMenuItemTag:[sender tag]];
</span></span></pre>
</div>
</div>
</body>
</html>