[Devtools] Fixed devtools altering srcset image after close

third_party/WebKit/Source/web/DevToolsEmulator.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/DevToolsEmulator.h"
 
+#include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
 #include "core/page/Page.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/geometry/IntRect.h"
@@ skipping 176 matching lines @@
 
 void DevToolsEmulator::enableDeviceEmulation(
     const WebDeviceEmulationParams& params) {
   if (m_deviceMetricsEnabled && m_emulationParams.viewSize == params.viewSize &&
       m_emulationParams.screenPosition == params.screenPosition &&
       m_emulationParams.deviceScaleFactor == params.deviceScaleFactor &&
       m_emulationParams.offset == params.offset &&
       m_emulationParams.scale == params.scale) {
     return;
   }
-
+  memoryCache()->evictResources();

[dgozman, 2016/12/13 20:56:11]

Let's only do this when necessary, e.g. deviceScaleFactor changed or when we
actually enabled/disabled emulation.

[allada, 2016/12/14 19:50:47]

Done. I moved it into blink instead.

   m_emulationParams = params;
 
   if (!m_deviceMetricsEnabled) {
     m_deviceMetricsEnabled = true;
     if (params.viewSize.width || params.viewSize.height)
       m_webViewImpl->setBackgroundColorOverride(Color::darkGray);
   }
 
   m_webViewImpl->page()->settings().setDeviceScaleAdjustment(
       calculateDeviceScaleAdjustment(params.viewSize.width,
@@ skipping 13 matching lines @@
   if (m_webViewImpl->mainFrameImpl()) {
     if (Document* document =
             m_webViewImpl->mainFrameImpl()->frame()->document())
       document->mediaQueryAffectingValueChanged();
   }
 }
 
 void DevToolsEmulator::disableDeviceEmulation() {
   if (!m_deviceMetricsEnabled)
     return;
-
+  memoryCache()->evictResources();
   m_deviceMetricsEnabled = false;
   m_webViewImpl->setBackgroundColorOverride(Color::transparent);
   m_webViewImpl->page()->settings().setDeviceScaleAdjustment(
       m_embedderDeviceScaleAdjustment);
   disableMobileEmulation();
   m_webViewImpl->setCompositorDeviceScaleFactorOverride(0.f);
   m_webViewImpl->setPageScaleFactor(1.f);
   updateRootLayerTransform();
   // mainFrameImpl() could be null during cleanup or remote <-> local swap.
   if (m_webViewImpl->mainFrameImpl()) {
@@ skipping 270 matching lines @@
       m_lastPinchAnchorCss.reset();
       m_lastPinchAnchorDip.reset();
     }
     return true;
   }
 
   return false;
 }
 
 }  // namespace blink