<!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>[171440] branches/safari-600.1-branch/Source/WebInspectorUI</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/171440">171440</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 23:49:12 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171312">r171312</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseImageUtilitiesjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseMainjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceMainhtml">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFindBannercss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFindBannerjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceBasePlatformjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (171439 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-23 06:46:59 UTC (rev 171439)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171312.
+
+ 2014-07-21 Jonathan Wells <jonowells@apple.com>
+
+ Back/Forward arrows (modern) are too large.
+ https://bugs.webkit.org/show_bug.cgi?id=135073
+
+ Reviewed by Joseph Pecoraro.
+
+ Changes to adjust new forward and back arrow sizes to be more consistent with the
+ universal design language. Moved WebInspector.Platform definition to its own file.
+ Refactored handling of image versions inside ImageUtilities.js.
+
+ * UserInterface/Base/ImageUtilities.js:
+ (.restoreImage):
+ (.generateImage):
+ (generateColoredImagesForCSS):
+ Make the default image versioning smarter.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector.contentLoaded.WebInspector.Platform.version.toString): Deleted.
+ (WebInspector.contentLoaded.WebInspector.Platform.toString): Deleted.
+ * UserInterface/Base/Platform.js: Added.
+ Move platform information definition into Platform.js.
+
+ * UserInterface/Main.html: Include Platform.js.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser):
+ * UserInterface/Views/FindBanner.css:
+ (.find-banner > button > .glyph):
+ (body.mac-platform.legacy .find-banner > button > .glyph):
+ (.find-banner > button.segmented.left > .glyph):
+ (body.mac-platform.legacy .find-banner > button.segmented.left > .glyph):
+ (.find-banner > button.segmented.right > .glyph):
+ (body.mac-platform.legacy .find-banner > button.segmented.right > .glyph):
+ (.find-banner > button.segmented):
+ (body.mac-platform.legacy .find-banner > button.segmented):
+ * UserInterface/Views/FindBanner.js:
+ (WebInspector.FindBanner.prototype._generateButtonsGlyphsIfNeeded):
+ Size of forward and back arrows adjusted.
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171227.
</span><span class="cx">
</span><span class="cx"> 2014-07-18 Timothy Hatcher <timothy@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseImageUtilitiesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js (171439 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js 2014-07-23 06:46:59 UTC (rev 171439)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -26,6 +26,11 @@
</span><span class="cx"> // Bump this version when making changes that affect the storage format.
</span><span class="cx"> const _imageStorageFormatVersion = 1;
</span><span class="cx">
</span><ins>+// Use as a default where an image version is not otherwise specified.
+// Bump the base version when making changes that affect the result image.
+const baseDefaultImageVersion = 3;
+const defaultImageVersion = baseDefaultImageVersion + 0.01 * WebInspector.Platform.version.base + 0.0001 * WebInspector.Platform.version.release;
+
</ins><span class="cx"> try {
</span><span class="cx"> var _generatedImageCacheDatabase = openDatabase("com.apple.WebInspector", 1, "Web Inspector Storage Database", 5 * 1024 * 1024);
</span><span class="cx"> } catch (e) {
</span><span class="lines">@@ -337,7 +342,7 @@
</span><span class="cx"> {
</span><span class="cx"> const storageKey = storageKeyPrefix + canvasIdentifierPrefix + canvasIdentifier;
</span><span class="cx"> const context = document.getCSSCanvasContext("2d", canvasIdentifierPrefix + canvasIdentifier, scaledWidth, scaledHeight);
</span><del>- restoreImageFromStorage(storageKey, context, scaledWidth, scaledHeight, specification.imageVersion || 0, function() {
</del><ins>+ restoreImageFromStorage(storageKey, context, scaledWidth, scaledHeight, specification.imageVersion || defaultImageVersion, function() {
</ins><span class="cx"> ensureImageIsLoaded(generateImage.bind(null, canvasIdentifier, specification));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -374,7 +379,7 @@
</span><span class="cx"> context.drawImage(coloredImage, 0, 0, width, height);
</span><span class="cx">
</span><span class="cx"> const storageKey = storageKeyPrefix + canvasIdentifierPrefix + canvasIdentifier;
</span><del>- saveImageToStorage(storageKey, context, scaledWidth, scaledHeight, specification.imageVersion || 0);
</del><ins>+ saveImageToStorage(storageKey, context, scaledWidth, scaledHeight, specification.imageVersion || defaultImageVersion);
</ins><span class="cx"> context.restore();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -393,9 +398,7 @@
</span><span class="cx"> var scaledWidth = width * scaleFactor;
</span><span class="cx"> var scaledHeight = height * scaleFactor;
</span><span class="cx">
</span><del>- // Bump the base version when making changes that affect the result image.
- const baseImageVersion = 3;
- const imageVersion = baseImageVersion + 0.01 * WebInspector.Platform.version.base + 0.0001 * WebInspector.Platform.version.release;
</del><ins>+ const imageVersion = defaultImageVersion;
</ins><span class="cx">
</span><span class="cx"> const storageKeyPrefix = "generated-embossed-image-";
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (171439 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-07-23 06:46:59 UTC (rev 171439)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -187,55 +187,14 @@
</span><span class="cx"> window.addEventListener("mousemove", this._mouseMoved.bind(this), true);
</span><span class="cx"> window.addEventListener("pagehide", this._pageHidden.bind(this));
</span><span class="cx">
</span><del>- // Check for a nightly build by looking for a plus in the version number and a small number of stylesheets (indicating combined resources).
- var versionMatch = / AppleWebKit\/([^ ]+)/.exec(navigator.userAgent);
- if (versionMatch && versionMatch[1].indexOf("+") !== -1 && document.styleSheets.length < 10)
- document.body.classList.add("nightly-build");
-
</del><span class="cx"> // Add platform style classes so the UI can be tweaked per-platform.
</span><del>- WebInspector.Platform = {
- name: InspectorFrontendHost.platform(),
- codeName: "",
- version: {
- base: 0,
- release: 0,
- toString: function()
- {
- return this.base + "." + this.version;
- }
- },
- toString: function()
- {
- return this.name;
- }
- };
-
- var isLegacyMacOS = false;
- var osVersionMatch = / Mac OS X (\d+)_(\d+)/.exec(navigator.appVersion);
- if (osVersionMatch && osVersionMatch[1] === "10") {
- WebInspector.Platform.version.base = 10;
- switch(osVersionMatch[2]) {
- case "10":
- WebInspector.Platform.codeName = "yosemite";
- WebInspector.Platform.version.release = 10;
- break;
- case "9":
- WebInspector.Platform.codeName = "mavericks";
- WebInspector.Platform.version.release = 9;
- isLegacyMacOS = true;
- break;
- case "8":
- WebInspector.Platform.codeName = "mountain-lion";
- WebInspector.Platform.version.release = 8;
- isLegacyMacOS = true;
- }
- }
-
- document.body.classList.add(WebInspector.Platform + "-platform");
- if (WebInspector.Platform.codeName)
- document.body.classList.add(WebInspector.Platform.codeName);
- if (isLegacyMacOS)
</del><ins>+ document.body.classList.add(WebInspector.Platform.name + "-platform");
+ if (WebInspector.Platform.isNightlyBuild)
+ document.body.classList.add("nightly-build");
+ if (WebInspector.Platform.isLegacyMacOS)
</ins><span class="cx"> document.body.classList.add("legacy");
</span><ins>+ if (WebInspector.Platform.version.name)
+ document.body.classList.add(WebInspector.Platform.version.name);
</ins><span class="cx">
</span><span class="cx"> this.debuggableType = InspectorFrontendHost.debuggableType() === "web" ? WebInspector.DebuggableType.Web : WebInspector.DebuggableType.JavaScript;
</span><span class="cx"> document.body.classList.add(this.debuggableType);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceBasePlatformjsfromrev171312trunkSourceWebInspectorUIUserInterfaceBasePlatformjs"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js (from rev 171312, trunk/Source/WebInspectorUI/UserInterface/Base/Platform.js) (0 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js (rev 0)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.Platform = {
+ name: InspectorFrontendHost.platform(),
+ isLegacyMacOS: false,
+ isNightlyBuild: false,
+ version: {
+ base: 0,
+ release: 0,
+ name: ""
+ }
+};
+
+(function () {
+ // Check for a nightly build by looking for a plus in the version number and a small number of stylesheets (indicating combined resources).
+ var versionMatch = / AppleWebKit\/([^ ]+)/.exec(navigator.userAgent);
+ if (versionMatch && versionMatch[1].indexOf("+") !== -1 && document.styleSheets.length < 10)
+ WebInspector.Platform.isNightlyBuild = true;
+
+ var isLegacyMacOS = false;
+ var osVersionMatch = / Mac OS X (\d+)_(\d+)/.exec(navigator.appVersion);
+ if (osVersionMatch && osVersionMatch[1] === "10") {
+ WebInspector.Platform.version.base = 10;
+ switch(osVersionMatch[2]) {
+ case "10":
+ WebInspector.Platform.version.name = "yosemite";
+ WebInspector.Platform.version.release = 10;
+ break;
+ case "9":
+ WebInspector.Platform.version.name = "mavericks";
+ WebInspector.Platform.version.release = 9;
+ WebInspector.Platform.isLegacyMacOS = true;
+ break;
+ case "8":
+ WebInspector.Platform.version.name = "mountain-lion";
+ WebInspector.Platform.version.release = 8;
+ WebInspector.Platform.isLegacyMacOS = true;
+ break;
+ }
+ }
+})();
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Main.html (171439 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Main.html 2014-07-23 06:46:59 UTC (rev 171439)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Main.html 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx"> <script src="External/CodeMirror/xml.js"></script>
</span><span class="cx">
</span><span class="cx"> <script src="Base/WebInspector.js"></script>
</span><ins>+ <script src="Base/Platform.js"></script>
</ins><span class="cx"> <script src="Base/Object.js"></script>
</span><span class="cx">
</span><span class="cx"> <script src="Base/DOMUtilities.js"></script>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (171439 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2014-07-23 06:46:59 UTC (rev 171439)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -53,11 +53,10 @@
</span><span class="cx"> if (WebInspector.Platform.name === "mac" && WebInspector.Platform.version.release < 10) {
</span><span class="cx"> forwardArrow = {src: "Images/ForwardArrowLegacy.svg", width: 9, height: 9};
</span><span class="cx"> backArrow = {src: "Images/BackArrowLegacy.svg", width: 9, height: 9};
</span><ins>+ } else {
+ forwardArrow = {src: "Images/ForwardArrow.svg", width: 8, height: 13};
+ backArrow = {src: "Images/BackArrow.svg", width: 8, height: 13};
</ins><span class="cx"> }
</span><del>- else {
- forwardArrow = {src: "Images/ForwardArrow.svg", width: 10, height: 16};
- backArrow = {src: "Images/BackArrow.svg", width: 10, height: 16};
- }
</del><span class="cx">
</span><span class="cx"> this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem("back", WebInspector.UIString("Back (%s)").format(this._backKeyboardShortcut.displayName), backArrow.src, backArrow.width, backArrow.height);
</span><span class="cx"> this._backButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._backButtonClicked, this);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFindBannercss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (171439 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2014-07-23 06:46:59 UTC (rev 171439)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -120,6 +120,10 @@
</span><span class="cx"> display: inline-block;
</span><span class="cx">
</span><span class="cx"> width: 7px;
</span><ins>+ height: 11px;
+}
+
+body.mac-platform.legacy .find-banner > button > .glyph {
</ins><span class="cx"> height: 7px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -150,10 +154,14 @@
</span><span class="cx">
</span><span class="cx"> .find-banner > button.segmented.left > .glyph {
</span><span class="cx"> background-image: -webkit-canvas(find-banner-previous-arrow-normal);
</span><del>- background-size: 7px 7px;
</del><ins>+ background-size: 7px 11px;
</ins><span class="cx"> background-repeat: no-repeat;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+body.mac-platform.legacy .find-banner > button.segmented.left > .glyph {
+ background-size: 7px 7px;
+}
+
</ins><span class="cx"> .find-banner > button.segmented.left:active:not(:disabled) > .glyph {
</span><span class="cx"> background-image: -webkit-canvas(find-banner-previous-arrow-normal-active);
</span><span class="cx"> }
</span><span class="lines">@@ -170,18 +178,29 @@
</span><span class="cx">
</span><span class="cx"> .find-banner > button.segmented.right > .glyph {
</span><span class="cx"> background-image: -webkit-canvas(find-banner-next-arrow-normal);
</span><del>- background-size: 7px 7px;
</del><ins>+ background-size: 7px 11px;
</ins><span class="cx"> background-repeat: no-repeat;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+body.mac-platform.legacy .find-banner > button.segmented.right > .glyph {
+ background-size: 7px 7px;
+}
+
</ins><span class="cx"> .find-banner > button.segmented.right:active:not(:disabled) > .glyph {
</span><span class="cx"> background-image: -webkit-canvas(find-banner-next-arrow-normal-active);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .find-banner > button.segmented {
</span><span class="cx"> min-width: 22px;
</span><ins>+ padding-top: 3px;
+ padding-bottom: 2px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+body.mac-platform.legacy .find-banner > button.segmented {
+ padding-top: 2px;
+ padding-bottom: 3px;
+}
+
</ins><span class="cx"> .find-banner > button.segmented:active {
</span><span class="cx"> z-index: 100;
</span><span class="cx"> position: relative;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFindBannerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.js (171439 => 171440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2014-07-23 06:46:59 UTC (rev 171439)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2014-07-23 06:49:12 UTC (rev 171440)
</span><span class="lines">@@ -328,15 +328,15 @@
</span><span class="cx">
</span><span class="cx"> var forwardArrow, backArrow;
</span><span class="cx"> if (WebInspector.Platform.name === "mac" && WebInspector.Platform.version.release < 10) {
</span><del>- forwardArrow = "Images/ForwardArrowLegacy.svg";
- backArrow = "Images/BackArrowLegacy.svg";
</del><ins>+ forwardArrow = {src: "Images/ForwardArrowLegacy.svg", width: 7, height: 7};
+ backArrow = {src: "Images/BackArrowLegacy.svg", width: 7, height: 7};
</ins><span class="cx"> } else {
</span><del>- forwardArrow = "Images/ForwardArrow.svg";
- backArrow = "Images/BackArrow.svg";
</del><ins>+ forwardArrow = {src: "Images/ForwardArrow.svg", width: 7, height: 11};
+ backArrow = {src: "Images/BackArrow.svg", width: 7, height: 11};
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- generateColoredImagesForCSS(backArrow, specifications, 7, 7, "find-banner-previous-arrow-");
- generateColoredImagesForCSS(forwardArrow, specifications, 7, 7, "find-banner-next-arrow-");
</del><ins>+ generateColoredImagesForCSS(backArrow.src, specifications, backArrow.width, backArrow.height, "find-banner-previous-arrow-");
+ generateColoredImagesForCSS(forwardArrow.src, specifications, forwardArrow.width, forwardArrow.height, "find-banner-next-arrow-");
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>