WebKit Bugzilla
Attachment 368277 Details for
Bug 197296
: Web Inspector: DOM: rename "low power" to "display composited"
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-197296-20190425152020.patch (text/plain), 36.41 KB, created by
Devin Rousso
on 2019-04-25 15:20:21 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Devin Rousso
Created:
2019-04-25 15:20:21 PDT
Size:
36.41 KB
patch
obsolete
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index faaa5b93536c99265d128514fac9ea6069dabecb..954c1cc56f606f628a63bc3a4460b4e70d18c253 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,14 @@ >+2019-04-25 Devin Rousso <drousso@apple.com> >+ >+ Web Inspector: DOM: rename "low power" to "display composted" >+ https://bugs.webkit.org/show_bug.cgi?id=197296 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Removed specific ChangeLog entries since it is almost entirely mechanical changes. >+ >+ * inspector/protocol/DOM.json: >+ > 2019-04-24 Saam Barati <sbarati@apple.com> > > Add SPI callbacks for before and after module execution >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index b9f94e7dcee92f7277c2bb2ca3ec91067b26d63e..1f06a26cbdcb9f20bd94bcf54c8996fc81ec1a74 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,15 @@ >+2019-04-25 Devin Rousso <drousso@apple.com> >+ >+ Web Inspector: DOM: rename "low power" to "display composted" >+ https://bugs.webkit.org/show_bug.cgi?id=197296 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Removed specific ChangeLog entries since it is almost entirely mechanical changes. >+ >+ * inspector/agents/InspectorDOMAgent.h: >+ * inspector/agents/InspectorDOMAgent.cpp: >+ > 2019-04-24 Zalan Bujtas <zalan@apple.com> > > Regression (r244291): Broken API Test AutoLayoutRenderingProgressRelativeOrdering >diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog >index cd2a80b3eaaebfdc0a3bd8992b63c187773871a0..8962a1d6cf89aaa2201dfd9612fe9f2e0bcdcb73 100644 >--- a/Source/WebInspectorUI/ChangeLog >+++ b/Source/WebInspectorUI/ChangeLog >@@ -1,3 +1,29 @@ >+2019-04-25 Devin Rousso <drousso@apple.com> >+ >+ Web Inspector: DOM: rename "low power" to "display composted" >+ https://bugs.webkit.org/show_bug.cgi?id=197296 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Removed specific ChangeLog entries since it is almost entirely mechanical changes. >+ >+ * UserInterface/Protocol/DOMObserver.js: >+ * UserInterface/Controllers/DOMManager.js: >+ * UserInterface/Controllers/TimelineManager.js: >+ * UserInterface/Models/DOMNode.js: >+ * UserInterface/Models/MediaInstrument.js: >+ * UserInterface/Models/MediaTimelineRecord.js: >+ * UserInterface/Models/TimelineRecording.js: >+ * UserInterface/Views/DOMEventsBreakdownView.js: >+ * UserInterface/Views/DOMEventsBreakdownView.css: >+ * UserInterface/Views/NetworkTableContentView.js: >+ * UserInterface/Views/NetworkTableContentView.css: >+ * UserInterface/Views/TimelineIcons.css: >+ * UserInterface/Views/TimelineTabContentView.js: >+ * UserInterface/Images/DisplayCompositedStateChanged.svg: Added. >+ * UserInterface/Images/LowPower.svg: Removed. >+ * Localizations/en.lproj/localizedStrings.js: >+ > 2019-04-24 Nikita Vasilyev <nvasilyev@apple.com> > > Web Inspector: Styles: don't start property selection when pressing right mouse button >diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json >index 1195e886de92a171ade48e832c6a06a6345421f0..5eafeacad220298d9cbd3b1ccb36fa922ad6e0ea 100644 >--- a/Source/JavaScriptCore/inspector/protocol/DOM.json >+++ b/Source/JavaScriptCore/inspector/protocol/DOM.json >@@ -677,12 +677,12 @@ > ] > }, > { >- "name": "videoLowPowerChanged", >- "description": "Called when a video element enters/exits low power mode.", >+ "name": "displayCompositedStateChanged", >+ "description": "Called when an element enters/exits a display composited state.", > "parameters": [ > { "name": "nodeId", "$ref": "NodeId" }, >- { "name": "timestamp", "$ref": "Network.Timestamp", "description": "Time when the video element entered/exited low power mode" }, >- { "name": "isLowPower", "type": "boolean" } >+ { "name": "timestamp", "$ref": "Network.Timestamp" }, >+ { "name": "isDisplayComposited", "type": "boolean" } > ] > } > ] >diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp >index ce6a2798c25cd268d5b2c62c2d660185c34ac6f0..1233f19a47cb1caa147161528a5f1957703ae709 100644 >--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp >+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp >@@ -2514,14 +2514,14 @@ void InspectorDOMAgent::mediaMetricsTimerFired() > continue; > } > >- bool isLowPower = (displayCompositedVideoFrames - iterator->value.displayCompositedFrames) > 0; >- if (iterator->value.isLowPower != isLowPower) { >- iterator->value.isLowPower = isLowPower; >+ bool isDisplayComposited = (displayCompositedVideoFrames - iterator->value.displayCompositedFrames) > 0; >+ if (iterator->value.isDisplayComposited != isDisplayComposited) { >+ iterator->value.isDisplayComposited = isDisplayComposited; > > int nodeId = pushNodePathToFrontend(mediaElement); > if (nodeId) { > auto timestamp = m_environment.executionStopwatch()->elapsedTime().seconds(); >- m_frontendDispatcher->videoLowPowerChanged(nodeId, timestamp, iterator->value.isLowPower); >+ m_frontendDispatcher->displayCompositedStateChanged(nodeId, timestamp, iterator->value.isDisplayComposited); > } > } > >diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h >index df23ced62ebd5c3cd9a8023544ac05f78696bf3c..b926e0db631d95b9ebc2172f1aa8aec63f5199ee 100644 >--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h >+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h >@@ -264,7 +264,7 @@ private: > Timer m_mediaMetricsTimer; > struct MediaMetrics { > unsigned displayCompositedFrames { 0 }; >- bool isLowPower { false }; >+ bool isDisplayComposited { false }; > > MediaMetrics() { } > >diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >index 51a6e858f70ee4b91270c9129cd8c7f1a34c815a..7802a4ca394f38b100765cba216818f4391c8fbe 100644 >--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >@@ -334,6 +334,7 @@ localizedStrings["Disable paint flashing"] = "Disable paint flashing"; > localizedStrings["Disable:"] = "Disable:"; > localizedStrings["Disabled"] = "Disabled"; > localizedStrings["Disk Cache"] = "Disk Cache"; >+localizedStrings["Display Composited"] = "Display Composited"; > localizedStrings["Displayed Columns"] = "Displayed Columns"; > localizedStrings["Do not clear network items on new page loads"] = "Do not clear network items on new page loads"; > localizedStrings["Do not clear the console on new page loads"] = "Do not clear the console on new page loads"; >@@ -421,7 +422,6 @@ localizedStrings["Ensure that only one live region is used on the page."] = "Ens > localizedStrings["Ensure that only one main content section is used on the page."] = "Ensure that only one main content section is used on the page."; > localizedStrings["Ensure that values for \u0022%s\u0022 are valid."] = "Ensure that values for \u0022%s\u0022 are valid."; > localizedStrings["Entered Full-Screen Mode"] = "Entered Full-Screen Mode"; >-localizedStrings["Entered Low-Power Mode"] = "Entered Low-Power Mode"; > localizedStrings["Entire Recording"] = "Entire Recording"; > localizedStrings["Error"] = "Error"; > localizedStrings["Error: "] = "Error: "; >@@ -442,7 +442,6 @@ localizedStrings["Example: \u201C%s\u201D"] = "Example: \u201C%s\u201D"; > localizedStrings["Exception with thrown value: %s"] = "Exception with thrown value: %s"; > localizedStrings["Execution context for $0"] = "Execution context for $0"; > localizedStrings["Exited Full-Screen Mode"] = "Exited Full-Screen Mode"; >-localizedStrings["Exited Low-Power Mode"] = "Exited Low-Power Mode"; > localizedStrings["Expand All"] = "Expand All"; > localizedStrings["Expand columns"] = "Expand columns"; > localizedStrings["Expanded"] = "Expanded"; >@@ -628,7 +627,6 @@ localizedStrings["Log WebSocket"] = "Log WebSocket"; > localizedStrings["Log: "] = "Log: "; > localizedStrings["Logs"] = "Logs"; > localizedStrings["Low"] = "Low"; >-localizedStrings["Low-Power Mode"] = "Low-Power Mode"; > localizedStrings["Lowest: %s"] = "Lowest: %s"; > localizedStrings["MIME Type"] = "MIME Type"; > localizedStrings["MIME Type:"] = "MIME Type:"; >@@ -991,6 +989,7 @@ localizedStrings["Start element selection (%s)"] = "Start element selection (%s) > localizedStrings["Start recording (%s)\nCreate new recording (%s)"] = "Start recording (%s)\nCreate new recording (%s)"; > localizedStrings["Start recording canvas actions.\nShift-click to record a single frame."] = "Start recording canvas actions.\nShift-click to record a single frame."; > localizedStrings["Start to Finish"] = "Start to Finish"; >+localizedStrings["Started Display Compositing"] = "Started Display Compositing"; > localizedStrings["State"] = "State"; > localizedStrings["Statistics"] = "Statistics"; > localizedStrings["Status"] = "Status"; >@@ -1007,6 +1006,7 @@ localizedStrings["Stop recording"] = "Stop recording"; > localizedStrings["Stop recording (%s)"] = "Stop recording (%s)"; > localizedStrings["Stop recording canvas actions"] = "Stop recording canvas actions"; > localizedStrings["Stop recording once page loads"] = "Stop recording once page loads"; >+localizedStrings["Stopped Display Compositing"] = "Stopped Display Compositing"; > localizedStrings["Stopping the \u201C%s\u201D audit"] = "Stopping the \u201C%s\u201D audit"; > localizedStrings["Storage"] = "Storage"; > localizedStrings["Style Attribute"] = "Style Attribute"; >diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js b/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js >index f68d89409c041157e8999ef361b82436e283e1a7..e74f77cd2eb163a0b760df05776ada4c686e3c3a 100644 >--- a/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js >+++ b/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js >@@ -166,7 +166,7 @@ WI.DOMManager = class DOMManager extends WI.Object > node.didFireEvent(eventName, timestamp, data); > } > >- videoLowPowerChanged(nodeId, timestamp, isLowPower) >+ displayCompositedStateChanged(nodeId, timestamp, isDisplayComposited) > { > // Called from WI.DOMObserver. > >@@ -174,7 +174,7 @@ WI.DOMManager = class DOMManager extends WI.Object > if (!node) > return; > >- node.videoLowPowerChanged(timestamp, isLowPower); >+ node.displayCompositedStateChanged(timestamp, isDisplayComposited); > } > > // Private >diff --git a/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js b/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js >index fe514c755a7689f1f8608fcf389bb0c9adc75a5d..3a1a5d2940a5857f27622fdb15b9c6e1c5c37ecd 100644 >--- a/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js >+++ b/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js >@@ -365,7 +365,7 @@ WI.TimelineManager = class TimelineManager extends WI.Object > WI.memoryManager.addEventListener(WI.MemoryManager.Event.MemoryPressure, this._memoryPressure, this); > > WI.DOMNode.addEventListener(WI.DOMNode.Event.DidFireEvent, this._handleDOMNodeDidFireEvent, this); >- WI.DOMNode.addEventListener(WI.DOMNode.Event.LowPowerChanged, this._handleDOMNodeLowPowerChanged, this); >+ WI.DOMNode.addEventListener(WI.DOMNode.Event.DisplayCompositedStateChanged, this._handleDOMNodeDisplayCompositedStateChanged, this); > > this._updateCapturingState(TimelineManager.CapturingState.Active, {startTime: this._capturingStartTime}); > } >@@ -1248,13 +1248,13 @@ WI.TimelineManager = class TimelineManager extends WI.Object > })); > } > >- _handleDOMNodeLowPowerChanged(event) >+ _handleDOMNodeDisplayCompositedStateChanged(event) > { >- let {timestamp, isLowPower} = event.data; >+ let {timestamp, isDisplayComposited} = event.data; > >- this._addRecord(new WI.MediaTimelineRecord(WI.MediaTimelineRecord.EventType.LowPower, timestamp, { >+ this._addRecord(new WI.MediaTimelineRecord(WI.MediaTimelineRecord.EventType.DisplayCompositedStateChanged, timestamp, { > domNode: event.target, >- isLowPower, >+ isDisplayComposited, > })); > } > }; >diff --git a/Source/WebInspectorUI/UserInterface/Images/DisplayCompositedStateChanged.svg b/Source/WebInspectorUI/UserInterface/Images/DisplayCompositedStateChanged.svg >new file mode 100644 >index 0000000000000000000000000000000000000000..27bf961b56c8bd503fe9d835930ea9382898052a >--- /dev/null >+++ b/Source/WebInspectorUI/UserInterface/Images/DisplayCompositedStateChanged.svg >@@ -0,0 +1,8 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Copyright © 2013 Apple Inc. All rights reserved. --> >+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16"> >+ <path fill="rgb(148, 190, 164)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 Z"/> >+ <path fill="rgb(101, 161, 134)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/> >+ <path fill="rgb(101, 161, 134)" d="M 4.445312 12.742188 C 3.890625 12.742188 3.445312 12.292969 3.445312 11.742188 L 3.445312 3.792969 C 3.445312 3.242188 3.890625 2.792969 4.445312 2.792969 L 7.867188 2.792969 C 9.367188 2.792969 10.554688 3.222656 11.402344 4.0625 C 12.25 4.910156 12.679688 6.101562 12.679688 7.601562 C 12.679688 9.171875 12.234375 10.429688 11.359375 11.347656 C 10.472656 12.273438 9.246094 12.742188 7.71875 12.742188 L 4.445312 12.742188 M 7.335938 9.613281 C 8.1875 9.613281 8.449219 9.324219 8.535156 9.226562 C 8.789062 8.941406 8.921875 8.414062 8.921875 7.699219 C 8.921875 7.140625 8.8125 6.703125 8.578125 6.363281 C 8.457031 6.183594 8.328125 6.070312 8.1875 6.011719 C 8.0625 5.964844 7.761719 5.882812 7.097656 5.882812 C 7.097656 6.960938 7.097656 8.539062 7.097656 9.613281 C 7.171875 9.613281 7.335938 9.613281 7.335938 9.613281"/> >+ <path fill="white" d="M 4.445312 11.742188 L 4.445312 3.792969 L 7.867188 3.792969 C 9.097656 3.792969 10.039062 4.121094 10.695312 4.773438 C 11.351562 5.425781 11.679688 6.371094 11.679688 7.601562 C 11.679688 8.910156 11.332031 9.929688 10.636719 10.65625 C 9.941406 11.378906 8.96875 11.742188 7.71875 11.742188 Z M 6.097656 10.613281 L 7.332031 10.613281 C 8.203125 10.613281 8.851562 10.375 9.28125 9.890625 C 9.707031 9.410156 9.921875 8.679688 9.921875 7.699219 C 9.921875 6.9375 9.75 6.308594 9.40625 5.800781 C 9.171875 5.453125 8.886719 5.214844 8.554688 5.082031 C 8.21875 4.949219 7.734375 4.882812 7.097656 4.882812 L 6.097656 4.882812 Z"/> >+</svg> >diff --git a/Source/WebInspectorUI/UserInterface/Images/LowPower.svg b/Source/WebInspectorUI/UserInterface/Images/LowPower.svg >deleted file mode 100644 >index 1b6e3820806f79cd29d008235f6679dfb4e7bffc..0000000000000000000000000000000000000000 >--- a/Source/WebInspectorUI/UserInterface/Images/LowPower.svg >+++ /dev/null >@@ -1,8 +0,0 @@ >-<?xml version="1.0" encoding="utf-8"?> >-<!-- Copyright © 2018 Apple Inc. All rights reserved. --> >-<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16"> >- <path fill="rgb(148, 190, 164)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 Z"/> >- <path fill="rgb(101, 161, 134)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/> >- <path fill="rgb(101, 161, 134)" d="M 5 13 L 6 13 L 11 13 L 12 13 L 12 12 L 12 10.8648649 L 12 9.86486486 L 11 9.86486486 L 8.57948709 9.86486483 L 8.57948718 4 L 8.57948718 3 L 7.57948718 3 L 6 3 L 5 3 L 5 4 L 5 12 L 5 13 Z M 5 13"/> >- <path fill="white" d="M 6 4 L 7.57948718 4 L 7.57948718 10.8648649 L 11 10.8648649 L 11 12 L 6 12 L 6 4 Z M 6 4"/> >-</svg> >diff --git a/Source/WebInspectorUI/UserInterface/Models/DOMNode.js b/Source/WebInspectorUI/UserInterface/Models/DOMNode.js >index 18b7e15fdcb8159595de41e468b960c72cdba523..c30042fd802afae74c887024cdb7c7d817ea395a 100644 >--- a/Source/WebInspectorUI/UserInterface/Models/DOMNode.js >+++ b/Source/WebInspectorUI/UserInterface/Models/DOMNode.js >@@ -147,7 +147,7 @@ WI.DOMNode = class DOMNode extends WI.Object > } > > this._domEvents = []; >- this._lowPowerRanges = []; >+ this._displayCompositedRanges = []; > > if (this._shouldListenForEventListeners()) > WI.DOMNode.addEventListener(WI.DOMNode.Event.DidFireEvent, this._handleDOMNodeDidFireEvent, this); >@@ -188,7 +188,7 @@ WI.DOMNode = class DOMNode extends WI.Object > > get frame() { return this._frame; } > get domEvents() { return this._domEvents; } >- get lowPowerRanges() { return this._lowPowerRanges; } >+ get displayCompositedRanges() { return this._displayCompositedRanges; } > > get attached() > { >@@ -757,30 +757,30 @@ WI.DOMNode = class DOMNode extends WI.Object > }); > } > >- videoLowPowerChanged(timestamp, isLowPower) >+ displayCompositedStateChanged(timestamp, isDisplayComposited) > { > // Called from WI.DOMManager. > >- console.assert(this.canEnterLowPowerMode()); >+ console.assert(this.canEnterDisplayCompositedState()); > >- let lastValue = this._lowPowerRanges.lastValue; >+ let lastValue = this._displayCompositedRanges.lastValue; > >- if (isLowPower) { >+ if (isDisplayComposited) { > console.assert(!lastValue || lastValue.endTimestamp); > if (!lastValue || lastValue.endTimestamp) >- this._lowPowerRanges.push({startTimestamp: timestamp}); >+ this._displayCompositedRanges.push({startTimestamp: timestamp}); > } else { > console.assert(!lastValue || lastValue.startTimestamp); > if (!lastValue) >- this._lowPowerRanges.push({endTimestamp: timestamp}); >+ this._displayCompositedRanges.push({endTimestamp: timestamp}); > else if (lastValue.startTimestamp) > lastValue.endTimestamp = timestamp; > } > >- this.dispatchEventToListeners(WI.DOMNode.Event.LowPowerChanged, {isLowPower, timestamp}); >+ this.dispatchEventToListeners(WI.DOMNode.Event.DisplayCompositedStateChanged, {isDisplayComposited, timestamp}); > } > >- canEnterLowPowerMode() >+ canEnterDisplayCompositedState() > { > return this.localName() === "video" || this.nodeName().toLowerCase() === "video"; > } >@@ -957,7 +957,7 @@ WI.DOMNode.Event = { > AttributeRemoved: "dom-node-attribute-removed", > EventListenersChanged: "dom-node-event-listeners-changed", > DidFireEvent: "dom-node-did-fire-event", >- LowPowerChanged: "dom-node-video-low-power-changed", >+ DisplayCompositedStateChanged: "dom-node-display-composited-state-changed", > }; > > WI.DOMNode.PseudoElementType = { >diff --git a/Source/WebInspectorUI/UserInterface/Models/MediaInstrument.js b/Source/WebInspectorUI/UserInterface/Models/MediaInstrument.js >index 20bf6d9f598a809de4f513c93bfe6c3f1fa33b20..9cbc06f5a035338c8ad4071775943d10d6f7a560 100644 >--- a/Source/WebInspectorUI/UserInterface/Models/MediaInstrument.js >+++ b/Source/WebInspectorUI/UserInterface/Models/MediaInstrument.js >@@ -36,8 +36,8 @@ WI.MediaInstrument = class MediaInstrument extends WI.Instrument > > static supported() > { >- // COMPATIBILITY (iOS 12): DOM.didFireEvent and DOM.videoLowPowerChanged did not exist. >- return window.DOMAgent && DOMAgent.hasEvent("didFireEvent") && DOMAgent.hasEvent("videoLowPowerChanged"); >+ // COMPATIBILITY (iOS 12): DOM.didFireEvent. >+ return InspectorBackend.domains.DOM && InspectorBackend.domains.DOM.hasEvent("didFireEvent"); > } > > // Protected >diff --git a/Source/WebInspectorUI/UserInterface/Models/MediaTimelineRecord.js b/Source/WebInspectorUI/UserInterface/Models/MediaTimelineRecord.js >index ed370704d5eb9cea6042d0d46aa7a2b0d69a322b..a3eaa5348713a48700bd52c8827cb540ed57e1db 100644 >--- a/Source/WebInspectorUI/UserInterface/Models/MediaTimelineRecord.js >+++ b/Source/WebInspectorUI/UserInterface/Models/MediaTimelineRecord.js >@@ -25,7 +25,7 @@ > > WI.MediaTimelineRecord = class MediaTimelineRecord extends WI.TimelineRecord > { >- constructor(eventType, timestamp, {domNode, domEvent, isLowPower} = {}) >+ constructor(eventType, timestamp, {domNode, domEvent, isDisplayComposited} = {}) > { > console.assert(Object.values(WI.MediaTimelineRecord.EventType).includes(eventType)); > >@@ -34,7 +34,7 @@ WI.MediaTimelineRecord = class MediaTimelineRecord extends WI.TimelineRecord > this._eventType = eventType; > this._domNode = domNode || null; > this._domEvent = domEvent || null; >- this._isLowPower = isLowPower || false; >+ this._isDisplayComposited = isDisplayComposited || false; > } > > // Import / Export >@@ -42,6 +42,11 @@ WI.MediaTimelineRecord = class MediaTimelineRecord extends WI.TimelineRecord > static fromJSON(json) > { > let {eventType, timestamp} = json; >+ >+ // COMPATIBILITY (iOS 12.2): isLowPower was renamed to isDisplayComposited. >+ if ("isLowPower" in json && !("isDisplayComposited" in json)) >+ json.isDisplayComposited = json.isLowPower; >+ > return new WI.MediaTimelineRecord(eventType, timestamp, json); > } > >@@ -61,7 +66,7 @@ WI.MediaTimelineRecord = class MediaTimelineRecord extends WI.TimelineRecord > eventType: this._eventType, > timestamp: this.startTime, > domEvent, >- isLowPower: this._isLowPower, >+ isDisplayComposited: this._isDisplayComposited, > }; > } > >@@ -70,7 +75,7 @@ WI.MediaTimelineRecord = class MediaTimelineRecord extends WI.TimelineRecord > get eventType() { return this._eventType; } > get domNode() { return this._domNode; } > get domEvent() { return this._domEvent; } >- get isLowPower() { return this._isLowPower; } >+ get isDisplayComposited() { return this._isDisplayComposited; } > > get displayName() > { >@@ -81,8 +86,8 @@ WI.MediaTimelineRecord = class MediaTimelineRecord extends WI.TimelineRecord > return eventName; > } > >- if (this._eventType === WI.MediaTimelineRecord.EventType.LowPower) >- return this._isLowPower ? WI.UIString("Entered Low-Power Mode") : WI.UIString("Exited Low-Power Mode"); >+ if (this._eventType === WI.MediaTimelineRecord.EventType.DisplayCompositedStateChanged) >+ return this._isDisplayComposited ? WI.UIString("Started Display Compositing") : WI.UIString("Stopped Display Compositing"); > > if (this._domNode) > return this._domNode.displayName; >@@ -96,16 +101,19 @@ WI.MediaTimelineRecord = class MediaTimelineRecord extends WI.TimelineRecord > super.saveIdentityToCookie(cookie); > > cookie["media-timeline-record-event-type"] = this._eventType; >+ if (this._eventType === WI.MediaTimelineRecord.EventType.DisplayCompositedStateChanged) >+ cookie["media-timeline-record-display-composited"] = this._isDisplayComposited; > if (this._domNode) > cookie["media-timeline-record-dom-node"] = this._domNode.path(); >- if (this._domEvent) >+ if (this._domEvent) { > cookie["media-timeline-record-dom-event"] = this._domEvent.eventName; >- if (this._isLowPower || (this._domEvent && this._domEvent.data && this._domEvent.data.enabled)) >- cookie["media-timeline-record-active"] = true; >+ if (this._domEvent.data && this._domEvent.data.enabled) >+ cookie["media-timeline-record-dom-event-active"] = true; >+ } > } > }; > > WI.MediaTimelineRecord.EventType = { > DOMEvent: "dom-event", >- LowPower: "low-power", >+ DisplayCompositedStateChanged: "display-composited-state-changed", > }; >diff --git a/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js b/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js >index d09fa661e47aa80ff3c25187e14c2095b460a723..fba9f92ae8b9b4fd556c90bc019a5e475ea0b2ca 100644 >--- a/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js >+++ b/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js >@@ -467,8 +467,8 @@ WI.TimelineRecording = class TimelineRecording extends WI.Object > if (record.eventType === WI.MediaTimelineRecord.EventType.DOMEvent) { > if (record.domEvent && record.domEvent.eventName) > key += ":" + record.domEvent.eventName; >- } else if (record.eventType === WI.MediaTimelineRecord.EventType.LowPower) >- key += ":" + (record.isLowPower ? "enabled" : "disabled"); >+ } else if (record.eventType === WI.MediaTimelineRecord.EventType.DisplayCompositedStateChanged) >+ key += ":" + (record.isDisplayComposited ? "enabled" : "disabled"); > } > if (record.sourceCodeLocation) > key += ":" + record.sourceCodeLocation.lineNumber + ":" + record.sourceCodeLocation.columnNumber; >diff --git a/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js b/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js >index eeddb28f0109aa8f6c7bd4d17bb8f358a76dfc1f..a0a79a97f1ac3c8a93400c41bcf64cb8442556aa 100644 >--- a/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js >+++ b/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js >@@ -119,6 +119,12 @@ WI.DOMObserver = class DOMObserver > > videoLowPowerChanged(nodeId, timestamp, isLowPower) > { >- WI.domManager.videoLowPowerChanged(nodeId, timestamp, isLowPower); >+ // COMPATIBILITY (iOS 12.2): DOM.videoLowPowerChanged was renamed to DOM.displayCompositedStateChanged. >+ WI.domManager.displayCompositedStateChanged(nodeId, timestamp, isLowPower); >+ } >+ >+ displayCompositedStateChanged(nodeId, timestamp, isDisplayComposited) >+ { >+ WI.domManager.displayCompositedStateChanged(nodeId, timestamp, isDisplayComposited); > } > }; >diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.css b/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.css >index 64aea24b1d45bb71e08e4ee8aa54fd9d7bfc012a..70d6234ab82ed8f49b6df50d3dec92b7dd93d65e 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.css >+++ b/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.css >@@ -76,7 +76,7 @@ > background-color: hsla(0, 0%, 75%, 0.25); > } > >-.dom-events-breakdown .graph > .area.low-power { >+.dom-events-breakdown .graph > .area.display-composited { > background-color: hsla(83, 100%, 48%, 0.4); > } > >diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.js b/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.js >index 89ff5ffa83bd05aabf932764434db4722988ba56..8381d46e37972aa2623a78a2b3d681d812405b55 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/DOMEventsBreakdownView.js >@@ -34,14 +34,13 @@ WI.DOMEventsBreakdownView = class DOMEventsBreakdownView extends WI.View > if (domNodeOrEvents instanceof WI.DOMNode) { > this._domNode = domNodeOrEvents; > this._domNode.addEventListener(WI.DOMNode.Event.DidFireEvent, this._handleDOMNodeDidFireEvent, this); >- if (this._domNode.canEnterLowPowerMode()) >- this._domNode.addEventListener(WI.DOMNode.Event.LowPowerChanged, this._handleDOMNodeLowPowerChanged, this); >+ if (this._domNode.canEnterDisplayCompositedState()) >+ this._domNode.addEventListener(WI.DOMNode.Event.DisplayCompositedStateChanged, this._handleDOMNodeDisplayCompositedStateChanged, this); > > this._domEvents = null; > } else { > this._domNode = null; > this._domEvents = domNodeOrEvents; >- this._lowPowerRanges = []; > } > > this._includeGraph = includeGraph || false; >@@ -112,7 +111,7 @@ WI.DOMEventsBreakdownView = class DOMEventsBreakdownView extends WI.View > fullscreenRanges.lastValue.originator = fullscreenDOMEvent.originator; > } > >- let lowPowerRanges = this._domNode ? this._domNode.lowPowerRanges : []; >+ let displayCompositedRanges = this._domNode ? this._domNode.displayCompositedRanges : []; > > for (let domEvent of domEvents) { > let rowElement = this._tableBodyElement.appendChild(document.createElement("tr")); >@@ -138,13 +137,13 @@ WI.DOMEventsBreakdownView = class DOMEventsBreakdownView extends WI.View > fullscreenArea.title = WI.UIString("Full-Screen"); > } > >- let lowPowerRange = lowPowerRanges.find((range) => domEvent.timestamp >= range.startTimestamp && domEvent.timestamp <= range.endTimestamp); >- if (lowPowerRange) { >- let lowPowerArea = graphCell.appendChild(document.createElement("div")); >- lowPowerArea.classList.add("area", "low-power"); >- lowPowerArea.title = WI.UIString("Low-Power Mode"); >- lowPowerArea.style.setProperty(styleAttribute, percentOfTotalTime(lowPowerRange.startTimestamp - startTimestamp) + "%"); >- lowPowerArea.style.setProperty("width", percentOfTotalTime(lowPowerRange.endTimestamp - lowPowerRange.startTimestamp) + "%"); >+ let displayCompositedRange = displayCompositedRanges.find((range) => domEvent.timestamp >= range.startTimestamp && domEvent.timestamp <= range.endTimestamp); >+ if (displayCompositedRange) { >+ let displayCompositedArea = graphCell.appendChild(document.createElement("div")); >+ displayCompositedArea.classList.add("area", "display-composited"); >+ displayCompositedArea.title = WI.UIString("Display Composited"); >+ displayCompositedArea.style.setProperty(styleAttribute, percentOfTotalTime(displayCompositedRange.startTimestamp - startTimestamp) + "%"); >+ displayCompositedArea.style.setProperty("width", percentOfTotalTime(displayCompositedRange.endTimestamp - displayCompositedRange.startTimestamp) + "%"); > } > > let graphImage = graphCell.appendChild(document.createElement("img")); >@@ -183,7 +182,7 @@ WI.DOMEventsBreakdownView = class DOMEventsBreakdownView extends WI.View > this.needsLayout(); > } > >- _handleDOMNodeLowPowerChanged(event) >+ _handleDOMNodeDisplayCompositedStateChanged(event) > { > this.needsLayout(); > } >diff --git a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css >index 6e3dd1e45b8c6d87c385fd8e10c5db262d276967..131ec5be50b8189defc3d0f6b073c17719464a3e 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css >+++ b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css >@@ -211,7 +211,7 @@ body[dir=rtl] .network-table .cell.name > .status { > background-color: hsla(0, 0%, 75%, 0.75); > } > >-.network-table :not(.header) .cell.waterfall .waterfall-container > .area.low-power { >+.network-table :not(.header) .cell.waterfall .waterfall-container > .area.display-composited { > background-color: var(--network-request-color); > } > >diff --git a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >index a7a9fc7bb25f217e2316cb3ec86abb066b2bf407..09fde6435e6692e0bce9d698bee26c5e4243bd08 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >@@ -822,15 +822,15 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > } > } > >- for (let lowPowerRange of domNode.lowPowerRanges) { >- let startTimestamp = lowPowerRange.startTimestamp || graphStartTime; >- let endTimestamp = lowPowerRange.endTimestamp || collection.waterfallEndTime; >+ for (let displayCompositedRange of domNode.displayCompositedRanges) { >+ let startTimestamp = displayCompositedRange.startTimestamp || graphStartTime; >+ let endTimestamp = displayCompositedRange.endTimestamp || collection.waterfallEndTime; > >- let lowPowerElement = container.appendChild(document.createElement("div")); >- lowPowerElement.classList.add("area", "low-power"); >- lowPowerElement.title = WI.UIString("Low-Power Mode"); >- positionByStartOffset(lowPowerElement, startTimestamp); >- setWidthForDuration(lowPowerElement, startTimestamp, endTimestamp); >+ let displayCompositedRangeElement = container.appendChild(document.createElement("div")); >+ displayCompositedRangeElement.classList.add("area", "display-composited"); >+ displayCompositedRangeElement.title = WI.UIString("Display Composited"); >+ positionByStartOffset(displayCompositedRangeElement, startTimestamp); >+ setWidthForDuration(displayCompositedRangeElement, startTimestamp, endTimestamp); > } > > let playing = false; >@@ -1819,8 +1819,8 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > this._domNodeEntries.set(resource.initiatorNode, nodeEntry); > > resource.initiatorNode.addEventListener(WI.DOMNode.Event.DidFireEvent, this._handleNodeDidFireEvent, this); >- if (resource.initiatorNode.canEnterLowPowerMode()) >- resource.initiatorNode.addEventListener(WI.DOMNode.Event.LowPowerChanged, this._handleNodeLowPowerChanged, this); >+ if (resource.initiatorNode.canEnterDisplayCompositedState()) >+ resource.initiatorNode.addEventListener(WI.DOMNode.Event.DisplayCompositedStateChanged, this._handleDOMNodeDisplayCompositedStateChanged, this); > } > > if (!this._entriesSortComparator) >@@ -1858,7 +1858,7 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > }); > } > >- _handleNodeLowPowerChanged(event) >+ _handleDOMNodeDisplayCompositedStateChanged(event) > { > this._runForMainCollection((collection, wasMain) => { > let domNode = event.target; >diff --git a/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css b/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css >index ca8e893393f746e38b848651167e3f680f95bf02..d9cecf48a09cb8fe49541a3e0a3476d593b96f99 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css >+++ b/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css >@@ -133,8 +133,8 @@ > content: url(../Images/DOMEventFullscreen.svg); > } > >-.low-power-record .icon { >- content: url(../Images/LowPower.svg); >+.display-composited-state-changed-record .icon { >+ content: url(../Images/DisplayCompositedStateChanged.svg); > } > > @media (prefers-color-scheme: dark) { >diff --git a/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js >index aed5ecf083a9ffeeac184c453a45c552b9c401ab..4ac5e92a4c65cbc44b548a5693b31e15d30d210d 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js >@@ -251,8 +251,8 @@ WI.TimelineTabContentView = class TimelineTabContentView extends WI.ContentBrows > switch (timelineRecord.eventType) { > case WI.MediaTimelineRecord.EventType.DOMEvent: > return "dom-event-record"; >- case WI.MediaTimelineRecord.EventType.LowPower: >- return "low-power-record"; >+ case WI.MediaTimelineRecord.EventType.DisplayCompositedStateChanged: >+ return "display-composited-state-changed-record"; > default: > console.error("Unknown MediaTimelineRecord eventType: " + timelineRecord.eventType, timelineRecord); > }
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=368277">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 197296
:
368277
|
368996
|
369007