Skip to content

Commit

Permalink
Merge to 2661 "[DevTools] Show viewport size on resize by default, di…
Browse files Browse the repository at this point in the history
…sable in device mode."

> [DevTools] Show viewport size on resize by default, disable in device mode.
>
> BUG=592847
>
> Review URL: https://codereview.chromium.org/1771853004
>
> Cr-Commit-Position: refs/heads/master@{#380212}

(cherry picked from commit 5e9b5ed)
TBR=pfeldman

Review URL: https://codereview.chromium.org/1807573002 .

Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#241}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
  • Loading branch information
dgozman committed Mar 15, 2016
1 parent 4c17e48 commit 81c1f12
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,8 @@ WebInspector.DeviceModeModel.prototype = {
this._applyUserAgent(mobile ? WebInspector.DeviceModeModel._defaultMobileUserAgent : "");
}
this._reapplyTouch();
if (this._target)
this._target.renderingAgent().setShowViewportSizeOnResize(this._type === WebInspector.DeviceModeModel.Type.None);
this._updateCallback.call(null);
},

Expand Down
1 change: 1 addition & 0 deletions third_party/WebKit/Source/devtools/front_end/main/Main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1108,6 +1108,7 @@ WebInspector.BackendSettingsSync.prototype = {
{
target.pageAgent().setAutoAttachToCreatedPages(this._autoAttachSetting.get());
target.emulationAgent().setScriptExecutionDisabled(this._disableJavascriptSetting.get());
target.renderingAgent().setShowViewportSizeOnResize(true);
},

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ WebInspector.RenderingOptionsView = function()
this._appendCheckbox(WebInspector.UIString("Show FPS meter"), "setShowFPSCounter");
var scrollingTitle = WebInspector.UIString("Shows areas of the page that slow down scrolling:\nTouch and mousewheel event listeners can delay scrolling.\nSome areas need to repaint their content when scrolled.");
this._appendCheckbox(WebInspector.UIString("Show scrolling perf issues"), "setShowScrollBottleneckRects", scrollingTitle);
this._appendCheckbox(WebInspector.UIString("Show page size on resize"), "setShowViewportSizeOnResize");

// CSS media.
var mediaRow = this.contentElement.createChild("div", "media-row");
Expand Down

0 comments on commit 81c1f12

Please sign in to comment.