Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / devtools / front_end / workspace / UISourceCode.js

diff --git a/src/third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js b/src/third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js
index 035d389..5472bef 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js
@@ -50,21 +50,19 @@ WebInspector.UISourceCode = function(project, parentPath, name, originURL, url,
     this._contentType = contentType;
     /** @type {!Array.<function(?string)>} */
     this._requestContentCallbacks = [];
-    /** @type {!Array.<!WebInspector.PresentationMessage>} */
-    this._consoleMessages = [];
 
     /** @type {!Array.<!WebInspector.Revision>} */
     this.history = [];
 }
 
+/**
+ * @enum {string}
+ */
 WebInspector.UISourceCode.Events = {
     WorkingCopyChanged: "WorkingCopyChanged",
     WorkingCopyCommitted: "WorkingCopyCommitted",
     TitleChanged: "TitleChanged",
     SavedStateUpdated: "SavedStateUpdated",
-    ConsoleMessageAdded: "ConsoleMessageAdded",
-    ConsoleMessageRemoved: "ConsoleMessageRemoved",
-    ConsoleMessagesCleared: "ConsoleMessagesCleared",
     SourceMappingChanged: "SourceMappingChanged",
 }
 
@@ -365,9 +363,9 @@ WebInspector.UISourceCode.prototype = {
          */
         function callback(accepted)
         {
-            if (!accepted)
-                return;
-            this._savedWithFileManager = true;
+            this._savedWithFileManager = accepted;
+            if (accepted)
+                this._hasCommittedChanges = false;
             this.dispatchEventToListeners(WebInspector.UISourceCode.Events.SavedStateUpdated);
         }
     },
@@ -515,15 +513,16 @@ WebInspector.UISourceCode.prototype = {
     /**
      * @return {string}
      */
-    highlighterType: function()
+    extension: function()
     {
+        if (this._project.type() === WebInspector.projectTypes.Network)
+            return this.contentType().canonicalMimeType();
         var lastIndexOfDot = this._name.lastIndexOf(".");
         var extension = lastIndexOfDot !== -1 ? this._name.substr(lastIndexOfDot + 1) : "";
         var indexOfQuestionMark = extension.indexOf("?");
         if (indexOfQuestionMark !== -1)
             extension = extension.substr(0, indexOfQuestionMark);
-        var mimeType = WebInspector.ResourceType.mimeTypesForExtensions[extension.toLowerCase()];
-        return mimeType || this.contentType().canonicalMimeType();
+        return extension;
     },
 
     /**
@@ -544,8 +543,7 @@ WebInspector.UISourceCode.prototype = {
     {
         var content = this.content();
         if (content) {
-            var provider = new WebInspector.StaticContentProvider(this.contentType(), content);
-            provider.searchInContent(query, caseSensitive, isRegex, callback);
+            WebInspector.StaticContentProvider.searchInContent(content, query, caseSensitive, isRegex, callback);
             return;
         }
 
@@ -575,38 +573,6 @@ WebInspector.UISourceCode.prototype = {
     },
 
     /**
-     * @return {!Array.<!WebInspector.PresentationMessage>}
-     */
-    consoleMessages: function()
-    {
-        return this._consoleMessages;
-    },
-
-    /**
-     * @param {!WebInspector.PresentationMessage} message
-     */
-    consoleMessageAdded: function(message)
-    {
-        this._consoleMessages.push(message);
-        this.dispatchEventToListeners(WebInspector.UISourceCode.Events.ConsoleMessageAdded, message);
-    },
-
-    /**
-     * @param {!WebInspector.PresentationMessage} message
-     */
-    consoleMessageRemoved: function(message)
-    {
-        this._consoleMessages.remove(message);
-        this.dispatchEventToListeners(WebInspector.UISourceCode.Events.ConsoleMessageRemoved, message);
-    },
-
-    consoleMessagesCleared: function()
-    {
-        this._consoleMessages = [];
-        this.dispatchEventToListeners(WebInspector.UISourceCode.Events.ConsoleMessagesCleared);
-    },
-
-    /**
      * @param {number} lineNumber
      * @param {number=} columnNumber
      * @return {!WebInspector.UILocation}
@@ -622,11 +588,6 @@ WebInspector.UISourceCode.prototype = {
 }
 
 /**
- * @interface
- */
-WebInspector.PresentationMessage = function() {}
-
-/**
  * @constructor
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {number} lineNumber