<!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>[181403] trunk/Source/WebCore</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/181403">181403</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-03-11 13:27:42 -0700 (Wed, 11 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Update fullscreen placeholder UI to use Vibrancy.
https://bugs.webkit.org/show_bug.cgi?id=142586
Reviewed by Eric Carlson.
Update the fullscreen placeholder with a translucent vibrant appearance
using NSVisualEffectView. Since NSVisuaEffectView is only available for
OS X 10.10 and above, wrap the new implementation in a version check and
retain the old implementation.
Drive-by: Update the strings for the placeholder view with new HI guidance
as well.
* English.lproj/Localizable.strings:
* platform/LocalizedStrings.cpp:
(WebCore::clickToExitFullScreenText):
* platform/mac/WebCoreFullScreenPlaceholderView.h:
* platform/mac/WebCoreFullScreenPlaceholderView.mm:
(-[WebCoreFullScreenPlaceholderView setExitWarningVisible:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringscpp">trunk/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewh">trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm">trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181402 => 181403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/ChangeLog 2015-03-11 20:27:42 UTC (rev 181403)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-03-11 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Update fullscreen placeholder UI to use Vibrancy.
+ https://bugs.webkit.org/show_bug.cgi?id=142586
+
+ Reviewed by Eric Carlson.
+
+ Update the fullscreen placeholder with a translucent vibrant appearance
+ using NSVisualEffectView. Since NSVisuaEffectView is only available for
+ OS X 10.10 and above, wrap the new implementation in a version check and
+ retain the old implementation.
+
+ Drive-by: Update the strings for the placeholder view with new HI guidance
+ as well.
+
+ * English.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::clickToExitFullScreenText):
+ * platform/mac/WebCoreFullScreenPlaceholderView.h:
+ * platform/mac/WebCoreFullScreenPlaceholderView.mm:
+ (-[WebCoreFullScreenPlaceholderView setExitWarningVisible:]):
+
</ins><span class="cx"> 2015-03-11 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to zoom on pages that claim to lay out to device size and then fail to do so
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (181402 => 181403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2015-03-11 20:27:42 UTC (rev 181403)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> "Clear Recent Searches" = "Clear Recent Searches";
</span><span class="cx">
</span><span class="cx"> /* Message to display in browser window when in webkit full screen mode. */
</span><del>-"Click to exit full screen mode" = "Click to exit full screen mode";
</del><ins>+"Click to Exit Full Screen" = "Click to Exit Full Screen";
</ins><span class="cx">
</span><span class="cx"> /* Subtitle of the label to show on a snapshotted plug-in */
</span><span class="cx"> "Click to restart" = "Click to restart";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (181402 => 181403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2015-03-11 20:27:42 UTC (rev 181403)
</span><span class="lines">@@ -1056,7 +1056,7 @@
</span><span class="cx">
</span><span class="cx"> String clickToExitFullScreenText()
</span><span class="cx"> {
</span><del>- return WEB_UI_STRING("Click to exit full screen mode", "Message to display in browser window when in webkit full screen mode.");
</del><ins>+ return WEB_UI_STRING("Click to Exit Full Screen", "Message to display in browser window when in webkit full screen mode.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h (181402 => 181403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h 2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h 2015-03-11 20:27:42 UTC (rev 181403)
</span><span class="lines">@@ -31,7 +31,12 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT @interface WebCoreFullScreenPlaceholderView : NSView {
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ RetainPtr<NSVisualEffectView> _effectView;
+ RetainPtr<NSTextField> _exitWarning;
+#else
</ins><span class="cx"> RetainPtr<NSView> _exitWarning;
</span><ins>+#endif
</ins><span class="cx"> NSObject* _target;
</span><span class="cx"> SEL _action;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm (181402 => 181403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm 2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm 2015-03-11 20:27:42 UTC (rev 181403)
</span><span class="lines">@@ -45,6 +45,38 @@
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ self.wantsLayer = YES;
+ self.autoresizesSubviews = YES;
+ self.layerContentsPlacement = NSViewLayerContentsPlacementTopLeft;
+ self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawNever;
+
+ _effectView = adoptNS([[NSVisualEffectView alloc] initWithFrame:frameRect]);
+ _effectView.get().wantsLayer = YES;
+ _effectView.get().autoresizesSubviews = YES;
+ _effectView.get().autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+ _effectView.get().blendingMode = NSVisualEffectBlendingModeWithinWindow;
+ _effectView.get().hidden = YES;
+ _effectView.get().material = NSVisualEffectMaterialLight;
+ _effectView.get().state = NSVisualEffectStateActive;
+ [self addSubview:_effectView.get()];
+
+ _exitWarning = adoptNS([[NSTextField alloc] initWithFrame:NSZeroRect]);
+ _exitWarning.get().autoresizingMask = NSViewMinXMargin | NSViewMaxXMargin | NSViewMinYMargin | NSViewMaxYMargin;
+ _exitWarning.get().bordered = NO;
+ _exitWarning.get().drawsBackground = NO;
+ _exitWarning.get().editable = NO;
+ _exitWarning.get().font = [NSFont systemFontOfSize:27];
+ _exitWarning.get().selectable = NO;
+ _exitWarning.get().stringValue = clickToExitFullScreenText();
+ _exitWarning.get().textColor = [NSColor tertiaryLabelColor];
+ [_exitWarning sizeToFit];
+
+ NSRect warningFrame = [_exitWarning.get() frame];
+ warningFrame.origin = NSMakePoint((frameRect.size.width - warningFrame.size.width) / 2, frameRect.size.height / 2);
+ _exitWarning.get().frame = warningFrame;
+ [_effectView addSubview:_exitWarning.get()];
+#else
</ins><span class="cx"> [self setLayer:[CALayer layer]];
</span><span class="cx"> [self setLayerContentsRedrawPolicy:NSViewLayerContentsRedrawNever];
</span><span class="cx"> [self setWantsLayer:YES];
</span><span class="lines">@@ -55,6 +87,7 @@
</span><span class="cx"> [_exitWarning.get() setFrame:warningFrame];
</span><span class="cx"> [_exitWarning.get() setHidden:YES];
</span><span class="cx"> [self addSubview:_exitWarning.get()];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -75,6 +108,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)setExitWarningVisible:(BOOL)visible
</span><span class="cx"> {
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ [_effectView setHidden:!visible];
+#else
</ins><span class="cx"> [_exitWarning.get() setHidden:!visible];
</span><span class="cx"> if (visible) {
</span><span class="cx"> CAFilter* filter = [CAFilter filterWithType:@"colorMonochrome"];
</span><span class="lines">@@ -83,6 +119,7 @@
</span><span class="cx"> [[self layer] setFilters:[NSArray arrayWithObject:filter]];
</span><span class="cx"> } else
</span><span class="cx"> [[self layer] setFilters:nil];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)mouseDown:(NSEvent *)theEvent
</span></span></pre>
</div>
</div>
</body>
</html>