Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (172378 => 172379)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-10 10:25:27 UTC (rev 172379)
@@ -1,3 +1,35 @@
+2014-08-10 Timothy Hatcher <[email protected]>
+
+ Web Inspector: new glyphs are visible on OS X 10.9 builds
+ https://bugs.webkit.org/show_bug.cgi?id=135743
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Images/Legacy/UserInputPrompt.svg: Removed.
+ * UserInterface/Images/Legacy/UserInputPromptPrevious.svg: Removed.
+ * UserInterface/Images/Legacy/UserInputResult.svg: Removed.
+ Removed images that were not used.
+
+ * UserInterface/Views/DashboardContainerView.css:
+ (body.mac-platform.legacy .dashboard-container .advance-arrow):
+ * UserInterface/Views/DebuggerDashboardView.js:
+ (WebInspector.DebuggerDashboardView):
+ * UserInterface/Views/FolderIcon.css:
+ (body.mac-platform.legacy .folder-icon .icon):
+ * UserInterface/Views/HierarchicalPathComponent.css:
+ (body.mac-platform.legacy .hierarchical-path-component > .selector-arrows):
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView):
+ Use legacy images.
+
+ * UserInterface/Views/NavigationSidebarPanel.css:
+ (.navigation-sidebar-panel-content-tree-outline:focus .item.selected .subtitle):
+ Fix color for selected subtitle.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel):
+ Use legacy images.
+
2014-08-09 Brian J. Burg <[email protected]>
Web Inspector: TimelineManager should reuse empty recordings
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPrompt.svg (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPrompt.svg 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPrompt.svg 2014-08-10 10:25:27 UTC (rev 172379)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
- <path fill="rgb(77, 153, 255)" d="M 7.910156 5.402344 C 7.859375 5.535156 7.78125 5.65625 7.675781 5.765625 L 4.730469 8.710938 C 4.324219 9.117188 3.664062 9.117188 3.257812 8.710938 C 2.851562 8.304688 2.851562 7.644531 3.257812 7.238281 L 5.484375 5.011719 L 3.265625 2.792969 C 2.859375 2.386719 2.859375 1.726562 3.265625 1.320312 C 3.671875 0.914062 4.332031 0.914062 4.738281 1.320312 L 7.683594 4.265625 C 7.992188 4.574219 8.066406 5.023438 7.910156 5.402344 Z"/>
-</svg>
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPromptPrevious.svg (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPromptPrevious.svg 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPromptPrevious.svg 2014-08-10 10:25:27 UTC (rev 172379)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
- <path fill="rgb(136, 136, 136)" d="M 7.910156 5.402344 C 7.859375 5.535156 7.78125 5.65625 7.675781 5.765625 L 4.730469 8.710938 C 4.324219 9.117188 3.664062 9.117188 3.257812 8.710938 C 2.851562 8.304688 2.851562 7.644531 3.257812 7.238281 L 5.484375 5.011719 L 3.265625 2.792969 C 2.859375 2.386719 2.859375 1.726562 3.265625 1.320312 C 3.671875 0.914062 4.332031 0.914062 4.738281 1.320312 L 7.683594 4.265625 C 7.992188 4.574219 8.066406 5.023438 7.910156 5.402344 Z"/>
-</svg>
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputResult.svg (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputResult.svg 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputResult.svg 2014-08-10 10:25:27 UTC (rev 172379)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
- <path fill="rgb(181, 181, 181)" d="M 3.515625 5.011719 L 5.742188 7.238281 C 6.148438 7.644531 6.148438 8.304688 5.742188 8.710938 C 5.335938 9.117188 4.675781 9.117188 4.269531 8.710938 L 1.324219 5.765625 C 1.21875 5.65625 1.140625 5.535156 1.089844 5.402344 C 0.933594 5.023438 1.007812 4.574219 1.316406 4.265625 L 4.261719 1.320312 C 4.667969 0.914062 5.328125 0.914062 5.734375 1.320312 C 6.140625 1.726562 6.140625 2.386719 5.734375 2.792969 Z M 7 6 C 6.445312 6 6 5.550781 6 5 C 6 4.449219 6.445312 4 7 4 C 7.554688 4 8 4.449219 8 5 C 8 5.550781 7.554688 6 7 6 Z"/>
-</svg>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2014-08-10 10:25:27 UTC (rev 172379)
@@ -178,6 +178,10 @@
transition-duration: 0.2s;
}
+body.mac-platform.legacy .dashboard-container .advance-arrow {
+ background-image: url(../Images/Legacy/UpDownArrows.svg);
+}
+
.dashboard-container .advance-arrow:hover {
opacity: 0.8;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js 2014-08-10 10:25:27 UTC (rev 172379)
@@ -32,8 +32,14 @@
this._navigationBar = new WebInspector.NavigationBar;
this.element.appendChild(this._navigationBar.element);
+ var resumeImage;
+ if (WebInspector.Platform.isLegacyMacOS)
+ resumeImage = {src: "Images/Legacy/Resume.svg", width: 16, height: 16};
+ else
+ resumeImage = {src: "Images/Resume.svg", width: 15, height: 15};
+
var tooltip = WebInspector.UIString("Continue script execution (%s or %s)").format(WebInspector.debuggerSidebarPanel.pauseOrResumeKeyboardShortcut.displayName, WebInspector.debuggerSidebarPanel.pauseOrResumeAlternateKeyboardShortcut.displayName);
- this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem("debugger-dashboard-pause", tooltip, tooltip, "Images/Resume.svg", 16, 16, true);
+ this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem("debugger-dashboard-pause", tooltip, tooltip, resumeImage.src, resumeImage.width, resumeImage.height, true);
this._debuggerResumeButtonItem.activated = true;
this._debuggerResumeButtonItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._resumeButtonClicked, this);
this._navigationBar.addNavigationItem(this._debuggerResumeButtonItem);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css 2014-08-10 10:25:27 UTC (rev 172379)
@@ -26,3 +26,7 @@
.folder-icon .icon {
content: -webkit-image-set(url(../Images/FolderGeneric.png) 1x, url(../Images/[email protected]) 2x);
}
+
+body.mac-platform.legacy .folder-icon .icon {
+ content: -webkit-image-set(url(../Images/Legacy/FolderGeneric.png) 1x, url(../Images/Legacy/[email protected]) 2x);
+}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css 2014-08-10 10:25:27 UTC (rev 172379)
@@ -66,6 +66,10 @@
content: url(../Images/UpDownArrows.svg);
}
+body.mac-platform.legacy .hierarchical-path-component > .selector-arrows {
+ content: url(../Images/Legacy/UpDownArrows.svg);
+}
+
.hierarchical-path-component > .title {
display: -webkit-flex;
-webkit-flex: 1;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2014-08-10 10:25:27 UTC (rev 172379)
@@ -76,7 +76,7 @@
var toolTip = WebInspector.UIString("Show split console");
var altToolTip = WebInspector.UIString("Show full-height console");
- this._toggleSplitNavigationItem = new WebInspector.ToggleButtonNavigationItem("split-toggle", toolTip, altToolTip, "Images/SplitToggleDown.svg", "Images/SplitToggleUp.svg", 16, 16);
+ this._toggleSplitNavigationItem = new WebInspector.ToggleButtonNavigationItem("split-toggle", toolTip, altToolTip, platformImagePath("SplitToggleDown.svg"), platformImagePath("Images/SplitToggleUp.svg"), 16, 16);
this._toggleSplitNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleSplit, this);
this._toggleSplitNavigationItem.toggled = WebInspector.isShowingSplitConsole();
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css 2014-08-10 10:25:27 UTC (rev 172379)
@@ -297,7 +297,7 @@
color: rgba(0, 0, 0, 0.7);
}
-.navigation-sidebar-panel-content-tree-outline .item.selected .subtitle {
+.navigation-sidebar-panel-content-tree-outline:focus .item.selected .subtitle {
color: rgba(255, 255, 255, 0.9);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (172378 => 172379)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2014-08-10 10:25:27 UTC (rev 172379)
@@ -110,9 +110,18 @@
this._replayCaptureButtonItem.enabled = true;
this._navigationBar.addNavigationItem(this._replayCaptureButtonItem);
+ var pauseImage, resumeImage;
+ if (WebInspector.Platform.isLegacyMacOS) {
+ pauseImage = {src: "Images/Legacy/Pause.svg", width: 16, height: 16};
+ resumeImage = {src: "Images/Legacy/Resume.svg", width: 16, height: 16};
+ } else {
+ pauseImage = {src: "Images/Pause.svg", width: 15, height: 15};
+ resumeImage = {src: "Images/Resume.svg", width: 15, height: 15};
+ }
+
toolTip = WebInspector.UIString("Start Playback");
altToolTip = WebInspector.UIString("Pause Playback");
- this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem("replay-pause-resume", toolTip, altToolTip, "Images/Resume.svg", "Images/Pause.svg", 16, 16, true);
+ this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem("replay-pause-resume", toolTip, altToolTip, resumeImage.src, pauseImage.src, pauseImage.width, pauseImage.height, true);
this._replayPauseResumeButtonItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._replayPauseResumeButtonClicked, this);
this._replayPauseResumeButtonItem.enabled = false;
this._navigationBar.addNavigationItem(this._replayPauseResumeButtonItem);
Modified: trunk/Source/WebKit/mac/ChangeLog (172378 => 172379)
--- trunk/Source/WebKit/mac/ChangeLog 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-10 10:25:27 UTC (rev 172379)
@@ -1,3 +1,13 @@
+2014-08-10 Timothy Hatcher <[email protected]>
+
+ Web Inspector: new glyphs are visible on OS X 10.9 builds
+ https://bugs.webkit.org/show_bug.cgi?id=135743
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (-[WebInspectorWindowController window]): Use 10100 instead of 1090 for the version.
+
2014-08-07 Benjamin Poulain <[email protected]>
Get rid of SCRIPTED_SPEECH
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (172378 => 172379)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-08-10 10:25:27 UTC (rev 172379)
@@ -495,7 +495,7 @@
window->_dockButton = _dockButton;
// Get the dock image and make it a template so the button cell effects will apply.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
NSString *dockImageName = @"Dock";
_dockButton.get().alphaValue = 0.55;
#else
Modified: trunk/Source/WebKit2/ChangeLog (172378 => 172379)
--- trunk/Source/WebKit2/ChangeLog 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-10 10:25:27 UTC (rev 172379)
@@ -1,3 +1,13 @@
+2014-08-10 Timothy Hatcher <[email protected]>
+
+ Web Inspector: new glyphs are visible on OS X 10.9 builds
+ https://bugs.webkit.org/show_bug.cgi?id=135743
+
+ Reviewed by Joseph Pecoraro.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::createInspectorWindow): Use 10100 instead of 1090 for the version.
+
2014-08-10 Carlos Garcia Campos <[email protected]>
[GTK] REGRESSION(r166239): The ld version script is not being used
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (172378 => 172379)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-08-10 08:45:13 UTC (rev 172378)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-08-10 10:25:27 UTC (rev 172379)
@@ -63,7 +63,7 @@
static const CGFloat dockButtonMargin = 3;
// The spacing between the dock buttons.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
static const CGFloat dockButtonSpacing = 1;
#else
static const CGFloat dockButtonSpacing = dockButtonMargin * 2;
@@ -312,7 +312,7 @@
static const int32_t firstVersionOfSafariWithDockToRightSupport = 0x02181d0d; // 536.29.13
static bool supportsDockToRight = NSVersionOfLinkTimeLibrary("Safari") >= firstVersionOfSafariWithDockToRightSupport;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
m_dockBottomButton = adoptNS(createDockButton(@"DockBottom"));
m_dockRightButton = adoptNS(createDockButton(@"DockRight"));
