| Index: Source/devtools/front_end/sdk/OverridesSupport.js
|
| diff --git a/Source/devtools/front_end/sdk/OverridesSupport.js b/Source/devtools/front_end/sdk/OverridesSupport.js
|
| index 986f56a6ec1d2a5ebb4cec09fa4f18459b252493..3a452b84f60576f48628306a4e7071d330412750 100644
|
| --- a/Source/devtools/front_end/sdk/OverridesSupport.js
|
| +++ b/Source/devtools/front_end/sdk/OverridesSupport.js
|
| @@ -40,6 +40,7 @@ WebInspector.OverridesSupport = function()
|
| this._emulateViewportEnabled = false;
|
| this._userAgent = "";
|
| this._pageResizer = null;
|
| + this._initialized = false;
|
| WebInspector.targetManager.observeTargets(this);
|
| }
|
|
|
| @@ -56,11 +57,6 @@ WebInspector.OverridesSupport.PageResizer = function()
|
| {
|
| };
|
|
|
| -WebInspector.OverridesSupport.PageResizer.Events = {
|
| - AvailableSizeChanged: "AvailableSizeChanged", // No data.
|
| - ResizeRequested: "ResizeRequested" // Data is of type {!Size}.
|
| -};
|
| -
|
| WebInspector.OverridesSupport.PageResizer.prototype = {
|
| /**
|
| * Zero width and height mean default size.
|
| @@ -399,17 +395,11 @@ WebInspector.OverridesSupport.prototype = {
|
| if (pageResizer === this._pageResizer)
|
| return;
|
|
|
| - if (this._pageResizer) {
|
| + if (this._pageResizer)
|
| this._pageResizer.disable();
|
| - this._pageResizer.removeEventListener(WebInspector.OverridesSupport.PageResizer.Events.AvailableSizeChanged, this._onPageResizerAvailableSizeChanged, this);
|
| - this._pageResizer.removeEventListener(WebInspector.OverridesSupport.PageResizer.Events.ResizeRequested, this._onPageResizerResizeRequested, this);
|
| - }
|
| this._pageResizer = pageResizer;
|
| - if (this._pageResizer) {
|
| - this._pageResizer.addEventListener(WebInspector.OverridesSupport.PageResizer.Events.AvailableSizeChanged, this._onPageResizerAvailableSizeChanged, this);
|
| - this._pageResizer.addEventListener(WebInspector.OverridesSupport.PageResizer.Events.ResizeRequested, this._onPageResizerResizeRequested, this);
|
| - }
|
| - this._deviceMetricsChanged();
|
| + if (this._initialized)
|
| + this._deviceMetricsChanged();
|
| },
|
|
|
| /**
|
| @@ -456,6 +446,7 @@ WebInspector.OverridesSupport.prototype = {
|
| this._applyInitialOverridesOnTargetAdded = true;
|
| return;
|
| }
|
| + this._initialized = true;
|
|
|
| if (this.settings.overrideDeviceOrientation.get())
|
| this._deviceOrientationChanged();
|
| @@ -489,17 +480,19 @@ WebInspector.OverridesSupport.prototype = {
|
| this.maybeHasActiveOverridesChanged();
|
| },
|
|
|
| - _onPageResizerAvailableSizeChanged: function()
|
| + pageResizerAvailableSizeChanged: function()
|
| {
|
| this._deviceMetricsChanged();
|
| },
|
|
|
| - _onPageResizerResizeRequested: function(event)
|
| + /**
|
| + * @param {!Size} size
|
| + */
|
| + pageResizerResizeRequested: function(size)
|
| {
|
| if (!this.settings.overrideDeviceMetrics.get())
|
| return;
|
|
|
| - var size = /** @type {!Size} */ (event.data);
|
| var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(this.settings.deviceMetrics.get());
|
| if (!metrics.isValid())
|
| return;
|
|
|