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 c3502b6..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
@@ -363,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);
         }
     },
@@ -513,7 +513,7 @@ WebInspector.UISourceCode.prototype = {
     /**
      * @return {string}
      */
-    highlighterType: function()
+    extension: function()
     {
         if (this._project.type() === WebInspector.projectTypes.Network)
             return this.contentType().canonicalMimeType();
@@ -522,8 +522,7 @@ WebInspector.UISourceCode.prototype = {
         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;
         }