Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/devtools/front_end/components/Linkifier.js

Issue 2487293002: DevTools: introduce sync checkmarks icons in StylesSidebarPane. (Closed)
Patch Set: DevTools: introduce icons in linkifier. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js » ('j') | third_party/WebKit/Source/devtools/front_end/persistence/Persistence.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/components/Linkifier.js
diff --git a/third_party/WebKit/Source/devtools/front_end/components/Linkifier.js b/third_party/WebKit/Source/devtools/front_end/components/Linkifier.js
index 97221657b101e52ec9c1174b31c44b5195f87c9a..4de0cd0f65d809c387b8ba5c82fd87ea010340d7 100644
--- a/third_party/WebKit/Source/devtools/front_end/components/Linkifier.js
+++ b/third_party/WebKit/Source/devtools/front_end/components/Linkifier.js
@@ -35,17 +35,49 @@
WebInspector.Linkifier = class {
/**
* @param {number=} maxLengthForDisplayedURLs
+ * @param {boolean=} useLinkDecorator
*/
- constructor(maxLengthForDisplayedURLs) {
+ constructor(maxLengthForDisplayedURLs, useLinkDecorator) {
this._maxLength = maxLengthForDisplayedURLs || WebInspector.Linkifier.MaxLengthForDisplayedURLs;
/** @type {!Map<!WebInspector.Target, !Array<!Element>>} */
this._anchorsByTarget = new Map();
/** @type {!Map<!WebInspector.Target, !WebInspector.LiveLocationPool>} */
this._locationPoolByTarget = new Map();
+ this._useLinkDecorator = true;
+ WebInspector.Linkifier._instances.add(this);
WebInspector.targetManager.observeTargets(this);
}
/**
+ * @param {!WebInspector.LinkDecorator} decorator
+ */
+ static setLinkDecorator(decorator) {
+ console.assert(!WebInspector.Linkifier._decorator, 'Cannot re-register icon provider.');
dgozman 2016/11/10 01:01:43 ... link decorator
lushnikov 2016/11/10 01:13:45 Done.
+ WebInspector.Linkifier._decorator = decorator;
+ decorator.addEventListener(WebInspector.LinkDecorator.Events.LinkIconChanged, onLinkIconChanged);
+ for (var linkifier of WebInspector.Linkifier._instances)
+ linkifier._updateAllAnchorDecorations();
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ function onLinkIconChanged(event) {
+ var uiSourceCode = /** @type {!WebInspector.UISourceCode} */(event.data);
+ var anchors = uiSourceCode[WebInspector.Linkifier._sourceCodeAnchors] || [];
+ for (var anchor of anchors)
dgozman 2016/11/10 01:01:43 s/anchor/link/g
lushnikov 2016/11/10 01:13:45 Done.
+ WebInspector.Linkifier._decorateLink(anchor);
dgozman 2016/11/10 01:01:43 _updateAnchorDecorations
lushnikov 2016/11/10 01:13:45 Done.
+ }
+ }
+
+ _updateAllAnchorDecorations() {
+ for (var target of this._anchorsByTarget.keysArray()) {
dgozman 2016/11/10 01:01:43 for (var anchors of this._anchorsByTarget.values()
lushnikov 2016/11/10 01:13:45 Done.
+ var anchors = this._anchorsByTarget.get(target);
+ for (var anchor of anchors)
+ WebInspector.Linkifier._decorateLink(anchor);
+ }
+ }
+
+ /**
* @param {?WebInspector.Linkifier.LinkHandler} handler
*/
static setLinkHandler(handler) {
@@ -81,6 +113,7 @@ WebInspector.Linkifier = class {
a.href = fallbackHref;
a.lineNumber = fallbackLineNumber;
}
+
/**
* @param {!Event} event
* @this {Object}
@@ -106,6 +139,36 @@ WebInspector.Linkifier = class {
}
/**
+ * @param {!Element} anchor
+ * @param {?WebInspector.UILocation} uiLocation
dgozman 2016/11/10 01:01:43 Let's not accept null.
lushnikov 2016/11/10 01:13:45 Done.
+ */
+ static _bindUILocation(anchor, uiLocation) {
+ anchor[WebInspector.Linkifier._uiLocationSymbol] = uiLocation;
+ if (!uiLocation)
+ return;
+ var uiSourceCode = uiLocation.uiSourceCode;
+ var sourceCodeAnchors = uiSourceCode[WebInspector.Linkifier._sourceCodeAnchors];
+ if (!sourceCodeAnchors) {
+ sourceCodeAnchors = new Set();
+ uiSourceCode[WebInspector.Linkifier._sourceCodeAnchors] = sourceCodeAnchors;
+ }
+ sourceCodeAnchors.add(anchor);
+ }
+
+ /**
+ * @param {!Element} anchor
+ */
+ static _unbindUILocation(anchor) {
+ if (!anchor[WebInspector.Linkifier._uiLocationSymbol])
+ return;
+
+ var uiSourceCode = anchor[WebInspector.Linkifier._uiLocationSymbol].uiSourceCode;
dgozman 2016/11/10 01:01:43 nullify this.
lushnikov 2016/11/10 01:13:45 Done.
+ var sourceCodeAnchors = uiSourceCode[WebInspector.Linkifier._sourceCodeAnchors];
+ if (sourceCodeAnchors)
+ sourceCodeAnchors.delete(anchor);
+ }
+
+ /**
* @param {!WebInspector.Target} target
* @param {string} scriptId
* @param {number} lineNumber
@@ -145,6 +208,7 @@ WebInspector.Linkifier = class {
var anchors = this._anchorsByTarget.remove(target);
for (var anchor of anchors) {
delete anchor[WebInspector.Linkifier._liveLocationSymbol];
+ WebInspector.Linkifier._unbindUILocation(anchor);
var fallbackAnchor = anchor[WebInspector.Linkifier._fallbackAnchorSymbol];
if (fallbackAnchor) {
anchor.href = fallbackAnchor.href;
@@ -281,7 +345,7 @@ WebInspector.Linkifier = class {
* @param {!Element} anchor
*/
disposeAnchor(target, anchor) {
- delete anchor[WebInspector.Linkifier._uiLocationSymbol];
+ WebInspector.Linkifier._unbindUILocation(anchor);
delete anchor[WebInspector.Linkifier._fallbackAnchorSymbol];
var liveLocation = anchor[WebInspector.Linkifier._liveLocationSymbol];
if (liveLocation)
@@ -295,6 +359,8 @@ WebInspector.Linkifier = class {
*/
_createAnchor(classes) {
var anchor = createElement('a');
+ if (this._useLinkDecorator)
+ anchor[WebInspector.Linkifier._enableDecoratorSymbol] = true;
anchor.className = (classes || '') + ' webkit-html-resource-link';
/**
@@ -325,6 +391,7 @@ WebInspector.Linkifier = class {
for (var target of this._anchorsByTarget.keysArray())
this.targetRemoved(target);
WebInspector.targetManager.unobserveTargets(this);
+ WebInspector.Linkifier._instances.delete(this);
}
/**
@@ -332,19 +399,12 @@ WebInspector.Linkifier = class {
* @param {!WebInspector.LiveLocation} liveLocation
*/
_updateAnchor(anchor, liveLocation) {
+ WebInspector.Linkifier._unbindUILocation(anchor);
var uiLocation = liveLocation.uiLocation();
+ WebInspector.Linkifier._bindUILocation(anchor, uiLocation);
if (!uiLocation)
return;
- anchor[WebInspector.Linkifier._uiLocationSymbol] = uiLocation;
- this._formatLiveAnchor(anchor, uiLocation, liveLocation.isBlackboxed());
- }
- /**
- * @param {!Element} anchor
- * @param {!WebInspector.UILocation} uiLocation
- * @param {boolean} isBlackboxed
- */
- _formatLiveAnchor(anchor, uiLocation, isBlackboxed) {
var text = uiLocation.linkText();
text = text.replace(/([a-f0-9]{7})[a-f0-9]{13}[a-f0-9]*/g, '$1\u2026');
if (this._maxLength)
@@ -355,11 +415,40 @@ WebInspector.Linkifier = class {
if (typeof uiLocation.lineNumber === 'number')
titleText += ':' + (uiLocation.lineNumber + 1);
anchor.title = titleText;
+ anchor.classList.toggle('webkit-html-blackbox-link', liveLocation.isBlackboxed());
+ WebInspector.Linkifier._decorateLink(anchor);
+ }
- anchor.classList.toggle('webkit-html-blackbox-link', isBlackboxed);
+ /**
+ * @param {!Element} anchor
+ */
+ static _decorateLink(anchor) {
+ if (!anchor[WebInspector.Linkifier._enableDecoratorSymbol])
+ return;
+ var uiLocation = anchor[WebInspector.Linkifier._uiLocationSymbol];
+ if (!WebInspector.Linkifier._decorator || !uiLocation)
+ return;
+ var icon = anchor.querySelector('span[is=ui-icon]');
dgozman 2016/11/10 01:01:43 Put this under symbol instead.
lushnikov 2016/11/10 01:13:45 Done.
+ if (icon)
+ icon.remove();
+ var newIcon = WebInspector.Linkifier._decorator.linkIcon(uiLocation.uiSourceCode);
dgozman 2016/11/10 01:01:43 reuse icon variable
lushnikov 2016/11/10 01:13:45 Done.
+ if (newIcon) {
+ newIcon.style.setProperty('margin-right', '2px');
+ anchor.insertBefore(newIcon, anchor.firstChild);
+ } else {
+// if (uiLocation.uiSourceCode.name().endsWith("common.scss"))
dgozman 2016/11/10 01:01:43 :-)
lushnikov 2016/11/10 01:13:45 Done.
+// debugger;
+ }
}
};
+/** @type {!Set<!WebInspector.Linkifier>} */
+WebInspector.Linkifier._instances = new Set();
+/** @type {?WebInspector.LinkDecorator} */
+WebInspector.Linkifier._decorator = null;
+
+WebInspector.Linkifier._enableDecoratorSymbol = Symbol('Linkifier.enableIconsSymbol');
+WebInspector.Linkifier._sourceCodeAnchors = Symbol('Linkifier.anchors');
WebInspector.Linkifier._uiLocationSymbol = Symbol('uiLocation');
WebInspector.Linkifier._fallbackAnchorSymbol = Symbol('fallbackAnchor');
WebInspector.Linkifier._liveLocationSymbol = Symbol('liveLocation');
@@ -392,6 +481,23 @@ WebInspector.Linkifier.LinkHandler.prototype = {
handleLink: function(url, lineNumber) {}
};
+/**
+ * @extends {WebInspector.EventTarget}
+ * @interface
+ */
+WebInspector.LinkDecorator = function() {};
+
+WebInspector.LinkDecorator.prototype = {
+ /**
+ * @param {!WebInspector.UISourceCode} uiSourceCode
+ * @return {?WebInspector.Icon}
+ */
+ linkIcon: function(uiSourceCode) {}
+};
+
+WebInspector.LinkDecorator.Events = {
+ LinkIconChanged: Symbol('LinkIconChanged')
+};
/**
* @param {string} string
« no previous file with comments | « no previous file | third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js » ('j') | third_party/WebKit/Source/devtools/front_end/persistence/Persistence.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698