Title: [267267] branches/safari-610-branch/Source
- Revision
- 267267
- Author
- [email protected]
- Date
- 2020-09-18 12:36:06 -0700 (Fri, 18 Sep 2020)
Log Message
Cherry-pick r267031. rdar://problem/69101165
Web Inspector: docking buttons don't work when already docked if window is too small
https://bugs.webkit.org/show_bug.cgi?id=216488
<rdar://problem/68242717>
Reviewed by Timothy Hatcher.
Source/WebInspectorUI:
* UserInterface/Base/Main.js:
(WI.updateDockingAvailability):
(WI.updateDockedState):
(WI._updateDockNavigationItems):
Always be sure to update the docking navigation items when docking becomes unavailable
instead of just forcing Web Inspector to undock as if Web Inspector is already undocked
then none of the docking navigation items will be updated. This makes it so that the
docking navigation items are hidden when docking becomes unavailable while undocked.
Source/WebKit:
* UIProcess/Inspector/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::attach):
(WebKit::WebInspectorProxy::attachAvailabilityChanged):
If Web Inspector is already attached, it can re-attach with a different configuration.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610-branch/Source/WebInspectorUI/ChangeLog (267266 => 267267)
--- branches/safari-610-branch/Source/WebInspectorUI/ChangeLog 2020-09-18 19:36:03 UTC (rev 267266)
+++ branches/safari-610-branch/Source/WebInspectorUI/ChangeLog 2020-09-18 19:36:06 UTC (rev 267267)
@@ -1,3 +1,51 @@
+2020-09-17 Alan Coon <[email protected]>
+
+ Cherry-pick r267031. rdar://problem/69101165
+
+ Web Inspector: docking buttons don't work when already docked if window is too small
+ https://bugs.webkit.org/show_bug.cgi?id=216488
+ <rdar://problem/68242717>
+
+ Reviewed by Timothy Hatcher.
+
+ Source/WebInspectorUI:
+
+ * UserInterface/Base/Main.js:
+ (WI.updateDockingAvailability):
+ (WI.updateDockedState):
+ (WI._updateDockNavigationItems):
+ Always be sure to update the docking navigation items when docking becomes unavailable
+ instead of just forcing Web Inspector to undock as if Web Inspector is already undocked
+ then none of the docking navigation items will be updated. This makes it so that the
+ docking navigation items are hidden when docking becomes unavailable while undocked.
+
+ Source/WebKit:
+
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::attach):
+ (WebKit::WebInspectorProxy::attachAvailabilityChanged):
+ If Web Inspector is already attached, it can re-attach with a different configuration.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-09-14 Devin Rousso <[email protected]>
+
+ Web Inspector: docking buttons don't work when already docked if window is too small
+ https://bugs.webkit.org/show_bug.cgi?id=216488
+ <rdar://problem/68242717>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ (WI.updateDockingAvailability):
+ (WI.updateDockedState):
+ (WI._updateDockNavigationItems):
+ Always be sure to update the docking navigation items when docking becomes unavailable
+ instead of just forcing Web Inspector to undock as if Web Inspector is already undocked
+ then none of the docking navigation items will be updated. This makes it so that the
+ docking navigation items are hidden when docking becomes unavailable while undocked.
+
2020-09-10 Alan Coon <[email protected]>
Cherry-pick r266624. rdar://problem/68652426
Modified: branches/safari-610-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (267266 => 267267)
--- branches/safari-610-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2020-09-18 19:36:03 UTC (rev 267266)
+++ branches/safari-610-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2020-09-18 19:36:06 UTC (rev 267267)
@@ -855,12 +855,10 @@
{
WI._dockingAvailable = available;
- if (!WI._dockingAvailable) {
+ WI._updateDockNavigationItems();
+
+ if (!WI._dockingAvailable)
WI.updateDockedState(WI.DockConfiguration.Undocked);
- return;
- }
-
- WI._updateDockNavigationItems();
};
WI.updateDockedState = function(side)
@@ -902,8 +900,6 @@
WI._updateDockNavigationItems();
- WI.tabBar.resetCachedWidths();
-
if (!WI.dockedConfigurationSupportsSplitContentBrowser() && !WI.doesCurrentTabSupportSplitContentBrowser())
WI.hideSplitConsole();
@@ -1928,6 +1924,8 @@
}
WI._updateTabBarDividers();
+
+ WI.tabBar.resetCachedWidths();
};
WI._tabBrowserSizeDidChange = function()
Modified: branches/safari-610-branch/Source/WebKit/ChangeLog (267266 => 267267)
--- branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-18 19:36:03 UTC (rev 267266)
+++ branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-18 19:36:06 UTC (rev 267267)
@@ -1,5 +1,49 @@
2020-09-17 Alan Coon <[email protected]>
+ Cherry-pick r267031. rdar://problem/69101165
+
+ Web Inspector: docking buttons don't work when already docked if window is too small
+ https://bugs.webkit.org/show_bug.cgi?id=216488
+ <rdar://problem/68242717>
+
+ Reviewed by Timothy Hatcher.
+
+ Source/WebInspectorUI:
+
+ * UserInterface/Base/Main.js:
+ (WI.updateDockingAvailability):
+ (WI.updateDockedState):
+ (WI._updateDockNavigationItems):
+ Always be sure to update the docking navigation items when docking becomes unavailable
+ instead of just forcing Web Inspector to undock as if Web Inspector is already undocked
+ then none of the docking navigation items will be updated. This makes it so that the
+ docking navigation items are hidden when docking becomes unavailable while undocked.
+
+ Source/WebKit:
+
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::attach):
+ (WebKit::WebInspectorProxy::attachAvailabilityChanged):
+ If Web Inspector is already attached, it can re-attach with a different configuration.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-09-14 Devin Rousso <[email protected]>
+
+ Web Inspector: docking buttons don't work when already docked if window is too small
+ https://bugs.webkit.org/show_bug.cgi?id=216488
+ <rdar://problem/68242717>
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::attach):
+ (WebKit::WebInspectorProxy::attachAvailabilityChanged):
+ If Web Inspector is already attached, it can re-attach with a different configuration.
+
+2020-09-17 Alan Coon <[email protected]>
+
Cherry-pick r266745. rdar://problem/69100985
Tighten checks when creating an audio buffer list
Modified: branches/safari-610-branch/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (267266 => 267267)
--- branches/safari-610-branch/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-09-18 19:36:03 UTC (rev 267266)
+++ branches/safari-610-branch/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-09-18 19:36:06 UTC (rev 267267)
@@ -279,7 +279,7 @@
void WebInspectorProxy::attach(AttachmentSide side)
{
ASSERT(m_inspectorPage);
- if (!m_inspectedPage || !m_inspectorPage || !platformCanAttach(canAttach()))
+ if (!m_inspectedPage || !m_inspectorPage || (!m_isAttached && !platformCanAttach(m_canAttach)))
return;
m_isAttached = true;
@@ -578,7 +578,7 @@
{
bool previousCanAttach = m_canAttach;
- m_canAttach = platformCanAttach(available);
+ m_canAttach = m_isAttached || platformCanAttach(available);
if (previousCanAttach == m_canAttach)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
