DevTools: Get rid of styleFile on UISourceCode

DevTools: Get rid of styleFile on UISourceCode

R=pfeldman

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=158931

[vsevik, 2013-10-03 13:48:57]

Please review

[pfeldman, 2013-10-03 15:15:20]

lgtm

[commit-bot: I haz the power, 2013-10-03 15:15:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/vsevik@chromium.org/25879002/1

[commit-bot: I haz the power, 2013-10-03 15:15:47]

Failed to apply patch for Source/devtools/front_end/StylesSourceMapping.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/devtools/front_end/StylesSourceMapping.js
  Hunk #2 FAILED at 138.
  Hunk #3 FAILED at 163.
  Hunk #4 succeeded at 169 (offset -10 lines).
  Hunk #5 succeeded at 201 (offset -10 lines).
  Hunk #6 succeeded at 316 (offset -10 lines).
  Hunk #7 succeeded at 354 (offset -10 lines).
  2 out of 7 hunks FAILED -- saving rejects to file
Source/devtools/front_end/StylesSourceMapping.js.rej

Patch:       Source/devtools/front_end/StylesSourceMapping.js
Index: Source/devtools/front_end/StylesSourceMapping.js
diff --git a/Source/devtools/front_end/StylesSourceMapping.js
b/Source/devtools/front_end/StylesSourceMapping.js
index
1ca9186dd055d7efce6b3cf2c8d4d14d3168fb25..817304cc8c212e6322a65c7ca3b385a2ee907622
100644
--- a/Source/devtools/front_end/StylesSourceMapping.js
+++ b/Source/devtools/front_end/StylesSourceMapping.js
@@ -40,8 +40,11 @@ WebInspector.StylesSourceMapping = function(cssModel,
workspace)
     this._workspace = workspace;
    
this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset,
this._projectWillReset, this);
    
this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded,
this._uiSourceCodeAddedToWorkspace, this);
+   
this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeRemoved,
this._uiSourceCodeRemoved, this);
 
    
WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameCreatedOrNavigated,
this._mainFrameCreatedOrNavigated, this);
+
+   
this._cssModel.addEventListener(WebInspector.CSSStyleModel.Events.StyleSheetChanged,
this._styleSheetChanged, this);
     this._initialize();
 }
 
@@ -135,9 +138,10 @@ WebInspector.StylesSourceMapping.prototype = {
      */
     _unbindUISourceCode: function(uiSourceCode)
     {
-        if (uiSourceCode.styleFile()) {
-            uiSourceCode.styleFile().dispose();
-            uiSourceCode.setStyleFile(null);
+        var styleFile = this._styleFiles.get(uiSourceCode);
+        if (styleFile) {
+            styleFile.dispose();
+            this._styleFiles.remove(uiSourceCode);
         }
         uiSourceCode.setSourceMapping(null);
     },
@@ -160,11 +164,11 @@ WebInspector.StylesSourceMapping.prototype = {
      */
     _bindUISourceCode: function(uiSourceCode, header)
     {
-        if (uiSourceCode.styleFile() || header.isInline)
+        if (this._styleFiles.get(uiSourceCode) || header.isInline)
             return;
         var url = uiSourceCode.url;
         uiSourceCode.setSourceMapping(this);
-        uiSourceCode.setStyleFile(new WebInspector.StyleFile(uiSourceCode));
+        this._styleFiles.put(uiSourceCode, new
WebInspector.StyleFile(uiSourceCode, this));
         header.updateLocations();
     },
 
@@ -176,13 +180,24 @@ WebInspector.StylesSourceMapping.prototype = {
         var project = /** @type {WebInspector.Project} */ (event.data);
         var uiSourceCodes = project.uiSourceCodes();
         for (var i = 0; i < uiSourceCodes; ++i)
-            delete this._urlToHeadersByFrameId[uiSourceCodes[i].url];
+            this._unbindUISourceCode(uiSourceCodes[i]);
+    },
+
+    /**
+     * @param {WebInspector.Event} event
+     */
+    _uiSourceCodeRemoved: function(event)
+    {
+        var uiSourceCode = /** @type {WebInspector.UISourceCode} */
(event.data);
+        this._unbindUISourceCode(uiSourceCode);
     },
 
     _initialize: function()
     {
         /** @type {!Object.<string,
!StringMap.<!StringMap.<!WebInspector.CSSStyleSheetHeader>>>} */
         this._urlToHeadersByFrameId = {};
+        /** @type {!Map.<WebInspector.UISourceCode, WebInspector.StyleFile>} */
+        this._styleFiles = new Map();
     },
 
     /**
@@ -197,16 +212,86 @@ WebInspector.StylesSourceMapping.prototype = {
             this._unbindUISourceCode(uiSourceCode);
         }
         this._initialize();
+    },
+
+    /**
+     * @param {WebInspector.UISourceCode} uiSourceCode
+     * @param {string} content
+     * @param {boolean} majorChange
+     * @param {function(?string)} userCallback
+     */
+    _setStyleContent: function(uiSourceCode, content, majorChange,
userCallback)
+    {
+        var styleSheetIds =
this._cssModel.styleSheetIdsForURL(uiSourceCode.url);
+        if (!styleSheetIds.length) {
+            userCallback("No stylesheet found: " + uiSourceCode.url);
+            return;
+        }
+
+        this._isSettingContent = true;
+        function callback(error)
+        {
+            userCallback(error);
+            delete this._isSettingContent;
+        }
+        this._cssModel.setStyleSheetText(styleSheetIds[0], content,
majorChange, callback.bind(this));
+    },
+
+    /**
+     * @param {WebInspector.Event} event
+     */
+    _styleSheetChanged: function(event)
+    {
+        if (this._isSettingContent)
+            return;
+
+        if (!event.data.majorChange)
+            return;
+
+        /**
+         * @param {?string} error
+         * @param {string} content
+         */
+        function callback(error, content)
+        {
+            if (!error)
+                this._innerStyleSheetChanged(event.data.styleSheetId, content);
+        }
+        CSSAgent.getStyleSheetText(event.data.styleSheetId,
callback.bind(this));
+    },
+
+    /**
+     * @param {CSSAgent.StyleSheetId} styleSheetId
+     * @param {string} content
+     */
+    _innerStyleSheetChanged: function(styleSheetId, content)
+    {
+        var header = this._cssModel.styleSheetHeaderForId(styleSheetId);
+        if (!header)
+            return;
+        var styleSheetURL = header.resourceURL();
+        if (!styleSheetURL)
+            return;
+
+        var uiSourceCode = this._workspace.uiSourceCodeForURL(styleSheetURL)
+        if (!uiSourceCode)
+            return;
+
+        var styleFile = this._styleFiles.get(uiSourceCode);
+        if (styleFile)
+            styleFile.addRevision(content);
     }
 }
 
 /**
  * @constructor
  * @param {WebInspector.UISourceCode} uiSourceCode
+ * @param {WebInspector.StylesSourceMapping} mapping
  */
-WebInspector.StyleFile = function(uiSourceCode)
+WebInspector.StyleFile = function(uiSourceCode, mapping)
 {
     this._uiSourceCode = uiSourceCode;
+    this._mapping = mapping;
    
this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged,
this._workingCopyChanged, this);
    
this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted,
this._workingCopyCommitted, this);
 }
@@ -242,7 +327,7 @@ WebInspector.StyleFile.prototype = {
     _commitIncrementalEdit: function(majorChange)
     {
         this._clearIncrementalUpdateTimer();
-        WebInspector.styleContentBinding.setStyleContent(this._uiSourceCode,
this._uiSourceCode.workingCopy(), majorChange,
this._styleContentSet.bind(this));
+        this._mapping._setStyleContent(this._uiSourceCode,
this._uiSourceCode.workingCopy(), majorChange,
this._styleContentSet.bind(this));
     },
 
     /**
@@ -280,88 +365,3 @@ WebInspector.StyleFile.prototype = {
        
this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged,
this._workingCopyChanged, this);
     }
 }
-
-/**
- * @constructor
- * @param {WebInspector.CSSStyleModel} cssModel
- */
-WebInspector.StyleContentBinding = function(cssModel, workspace)
-{
-    this._cssModel = cssModel;
-    this._workspace = workspace;
-   
this._cssModel.addEventListener(WebInspector.CSSStyleModel.Events.StyleSheetChanged,
this._styleSheetChanged, this);
-}
-
-WebInspector.StyleContentBinding.prototype = {
-    /**
-     * @param {WebInspector.UISourceCode} uiSourceCode
-     * @param {string} content
-     * @param {boolean} majorChange
-     * @param {function(?string)} userCallback
-     */
-    setStyleContent: function(uiSourceCode, content, majorChange, userCallback)
-    {
-        var styleSheetIds =
this._cssModel.styleSheetIdsForURL(uiSourceCode.url);
-        if (!styleSheetIds.length) {
-            userCallback("No stylesheet found: " + uiSourceCode.url);
-            return;
-        }
-
-        this._isSettingContent = true;
-        function callback(error)
-        {
-            userCallback(error);
-            delete this._isSettingContent;
-        }
-        this._cssModel.setStyleSheetText(styleSheetIds[0], content,
majorChange, callback.bind(this));
-    },
-
-    /**
-     * @param {WebInspector.Event} event
-     */
-    _styleSheetChanged: function(event)
-    {
-        if (this._isSettingContent)
-            return;
-
-        if (!event.data.majorChange)
-            return;
-
-        /**
-         * @param {?string} error
-         * @param {string} content
-         */
-        function callback(error, content)
-        {
-            if (!error)
-                this._innerStyleSheetChanged(event.data.styleSheetId, content);
-        }
-        CSSAgent.getStyleSheetText(event.data.styleSheetId,
callback.bind(this));
-    },
-
-    /**
-     * @param {CSSAgent.StyleSheetId} styleSheetId
-     * @param {string} content
-     */
-    _innerStyleSheetChanged: function(styleSheetId, content)
-    {
-        var header = this._cssModel.styleSheetHeaderForId(styleSheetId);
-        if (!header)
-            return;
-        var styleSheetURL = header.resourceURL();
-        if (!styleSheetURL)
-            return;
-
-        var uiSourceCode = this._workspace.uiSourceCodeForURL(styleSheetURL)
-        if (!uiSourceCode)
-            return;
-
-        if (uiSourceCode.styleFile())
-            uiSourceCode.styleFile().addRevision(content);
-    }
-}
-
-/**
- * @type {?WebInspector.StyleContentBinding}
- */
-WebInspector.styleContentBinding = null;

[commit-bot: I haz the power, 2013-10-04 09:33:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/vsevik@chromium.org/25879002/7001

[commit-bot: I haz the power, 2013-10-04 10:33:50]

Retried try job too often on linux_blink_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...

[commit-bot: I haz the power, 2013-10-04 12:30:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/vsevik@chromium.org/25879002/21001

[commit-bot: I haz the power, 2013-10-04 13:57:44]

Change committed as 158931