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

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

Index: third_party/WebKit/Source/devtools/front_end/network/RequestPreviewView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network/RequestPreviewView.js b/third_party/WebKit/Source/devtools/front_end/network/RequestPreviewView.js
index a316ec37b3998595b8294d609638079f1f38e944..45ce5c37f71a8298cd7063c9cb212ea42cbf8cf5 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/RequestPreviewView.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/RequestPreviewView.js
@@ -38,6 +38,8 @@ WebInspector.RequestPreviewView = function(request, responseView)
 {
     WebInspector.RequestContentView.call(this, request);
     this._responseView = responseView;
+    /** @type {?WebInspector.Widget} */
+    this._previewView = null;
 }
 
 WebInspector.RequestPreviewView.prototype = {
@@ -47,21 +49,20 @@ WebInspector.RequestPreviewView.prototype = {
             if (!this._emptyWidget) {
                 this._emptyWidget = this._createEmptyWidget();
                 this._emptyWidget.show(this.element);
-                this.innerView = this._emptyWidget;
-            }
-        } else {
-            if (this._emptyWidget) {
-                this._emptyWidget.detach();
-                delete this._emptyWidget;
-            }
-
-            if (!this._previewView) {
-                this._createPreviewView(handlePreviewView.bind(this));
-            } else {
-                this.innerView = this._previewView;
-                handlePreviewView.call(this, this.innerView);
+                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.

             }
+            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._previewView.show(this.element);
 
         /**
          * @param {!WebInspector.Widget} view
@@ -70,14 +71,13 @@ WebInspector.RequestPreviewView.prototype = {
         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);
         }
     },