[Devtools] Regression fix for double toolbar for images in network

third_party/WebKit/Source/devtools/front_end/network/RequestPreviewView.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 /**
  * @constructor
  * @extends {WebInspector.RequestContentView}
  * @param {!WebInspector.NetworkRequest} request
  * @param {!WebInspector.Widget} responseView
  */
 WebInspector.RequestPreviewView = function(request, responseView)
 {
     WebInspector.RequestContentView.call(this, request);
     this._responseView = responseView;
+    /** @type {?WebInspector.Widget} */
+    this._previewView = null;
 }
 
 WebInspector.RequestPreviewView.prototype = {
     contentLoaded: function()
     {
         if (!this.request.content && !this.request.contentError()) {
             if (!this._emptyWidget) {
                 this._emptyWidget = this._createEmptyWidget();
                 this._emptyWidget.show(this.element);
-                this.innerView = this._emptyWidget;
+                this._previewView = this._emptyWidget;

[lushnikov, 2016/08/03 20:09:05]

remove

[allada, 2016/08/03 23:50:05]

This is here because it tries to get the content and if it fails it will try to
get the content again next call and uses an empty widget until it's ready.
Example would be a websocket or a request that does not have any content yet
show empty widget and try to get content again when able to.

             }
-        } else {
-            if (this._emptyWidget) {
-                this._emptyWidget.detach();
-                delete this._emptyWidget;
-            }
+            return;
+        }
+        if (this._emptyWidget) {
+            this._emptyWidget.detach();
+            delete this._emptyWidget;
+            this._previewView = null;

[lushnikov, 2016/08/03 20:09:05]

remove

[allada, 2016/08/03 23:50:04]

needed because of above.

+        }
 
-            if (!this._previewView) {
-                this._createPreviewView(handlePreviewView.bind(this));
-            } else {
-                this.innerView = this._previewView;
-                handlePreviewView.call(this, this.innerView);
-            }
-        }
+        if (!this._previewView)
+            this._createPreviewView(handlePreviewView.bind(this));
+        else
+            this._previewView.show(this.element);
 
         /**
          * @param {!WebInspector.Widget} view
          * @this {WebInspector.RequestPreviewView}
          */
         function handlePreviewView(view)
         {
             this._previewView = view;
-            this._previewView.show(this.element);
-            if (this._previewView instanceof WebInspector.View) {
+            view.show(this.element);
+            if (view instanceof WebInspector.View) {
                 var toolbar = new WebInspector.Toolbar("network-item-preview-toolbar", this.element);
-                for (var item of /** @type {!WebInspector.View} */ (this._previewView).toolbarItems())
+                for (var item of /** @type {!WebInspector.View} */ (view).toolbarItems())
                     toolbar.appendToolbarItem(item);
             }
-            this.innerView = this._previewView;
-            this._previewViewHandledForTest(this._previewView);
+            this._previewViewHandledForTest(view);
         }
     },
 
     /**
      * @param {!WebInspector.Widget} view
      */
     _previewViewHandledForTest: function(view) { },
 
     /**
      * @return {!WebInspector.EmptyWidget}
@@ skipping 53 matching lines @@
         var dataURL = this.request.asDataURL();
         if (dataURL === null)
             return null;
 
         return new WebInspector.RequestHTMLView(this.request, dataURL);
     },
 
     /**
      * @param {function(!WebInspector.Widget)} callback
      */
     _createPreviewView: function(callback)

[lushnikov, 2016/08/03 20:09:05]

let's rename this into _getPreviewView: it doesn't have a "create" semantics;
instead, it sometimes fetches something.

[allada, 2016/08/03 23:50:04]

It is a wrapper for other create functions. This function is used to create
whatever view needed based on the content.

     {
         if (this.request.contentError()) {
             callback(this._createMessageView(WebInspector.UIString("Failed to load response data")));
             return;
         }
 
         var xmlView = this._xmlView();
         if (xmlView) {
             callback(xmlView);
             return;
@@ skipping 25 matching lines @@
 
             if (this.request.resourceType() === WebInspector.resourceTypes.Other)
                 return this._createEmptyWidget();
 
             return WebInspector.RequestView.nonSourceViewForRequest(this.request);
         }
     },
 
     __proto__: WebInspector.RequestContentView.prototype
 }