Use DSF instead of UI scale if the native DSF is 1.25 and UI Scale is 0.8x (dsf=1.25 equivalent)

Use DSF instead of UI scale if the native DSF is 1.25  and UI Scale is 0.8x (dsf=1.25 equivalent)

Disable high DPI assets for ui scaling. This will be removed in 39, after this change is landed.

BUG=413368
Committed: https://crrev.com/4433bc75923b6fb4718f744e934ddf5ade2db2de
Cr-Commit-Position: refs/heads/master@{#295209}

[oshima, 2014-09-16 08:03:28]

oshima@chromium.org changed reviewers:
+ mukai@chromium.org

[oshima, 2014-09-16 08:07:02]

please review this one instead.

https://codereview.chromium.org/578553002/diff/20001/ash/display/display_mana...
File ash/display/display_manager.cc (right):

https://codereview.chromium.org/578553002/diff/20001/ash/display/display_mana...
ash/display/display_manager.cc:255: info_list.back().set_native(true);
these are to get "restore display settings" working on desktop.

[Jun Mukai, 2014-09-16 15:41:10]

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info.h
File ash/display/display_info.h (right):

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info...
ash/display/display_info.h:100: static void SetUse125DSFForUIScaling(bool
enable);
nobody seems to call this.  how does this get enabled in the real environment?

[oshima, 2014-09-16 15:59:41]

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info.h
File ash/display/display_info.h (right):

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info...
ash/display/display_info.h:100: static void SetUse125DSFForUIScaling(bool
enable);
On 2014/09/16 15:41:10, Jun Mukai wrote:
> nobody seems to call this.  how does this get enabled in the real environment?

I'll land it as separate CL. The plan is to land and merge this, and then
land CL to enable it on ToT, and then merge it after last m38 beta.

[Jun Mukai, 2014-09-16 16:33:56]

okay, lgtm

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info.cc
File ash/display/display_info.cc (right):

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info...
ash/display/display_info.cc:294: return configured_ui_scale_ == 0.8f ? 1.25f :
1.0f;
I personally prefer parens for this type of conditional operator, like
(configured_ui_scale_ == 0.8f) ? 1.25f : 1.0f;

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info...
ash/display/display_info.cc:307: return configured_ui_scale_ == 0.8f ? 1.0f :
configured_ui_scale_;
ditto

[oshima, 2014-09-16 17:05:39]

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info.cc
File ash/display/display_info.cc (right):

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info...
ash/display/display_info.cc:294: return configured_ui_scale_ == 0.8f ? 1.25f :
1.0f;
On 2014/09/16 16:33:56, Jun Mukai wrote:
> I personally prefer parens for this type of conditional operator, like
> (configured_ui_scale_ == 0.8f) ? 1.25f : 1.0f;

Done.

https://codereview.chromium.org/578553002/diff/40001/ash/display/display_info...
ash/display/display_info.cc:307: return configured_ui_scale_ == 0.8f ? 1.0f :
configured_ui_scale_;
On 2014/09/16 16:33:56, Jun Mukai wrote:
> ditto

Done.

[oshima, 2014-09-16 17:05:42]

The CQ bit was checked by oshima@chromium.org

[oshima, 2014-09-16 17:06:29]

The CQ bit was unchecked by oshima@chromium.org

[oshima, 2014-09-16 17:11:42]

forgot to make one more change. PTAL

https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
File ash/display/display_manager.cc (left):

https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
ash/display/display_manager.cc:174: 
I also want to remove this, as installing 2x assets unintentionally enabled
this.

[Jun Mukai, 2014-09-16 18:18:56]

https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
File ash/display/display_manager.cc (left):

https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
ash/display/display_manager.cc:174: 
On 2014/09/16 17:11:42, oshima wrote:
> I also want to remove this, as installing 2x assets unintentionally enabled
> this.

Removing this means allow_upgrade_to_high_dpi never gets true and may cause
problems on Pixel, right?

[oshima, 2014-09-16 18:47:16]

https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
File ash/display/display_manager.cc (left):

https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
ash/display/display_manager.cc:174: 
On 2014/09/16 18:18:56, Jun Mukai wrote:
> On 2014/09/16 17:11:42, oshima wrote:
> > I also want to remove this, as installing 2x assets unintentionally enabled
> > this.
> 
> Removing this means allow_upgrade_to_high_dpi never gets true and may cause
> problems on Pixel, right?

Pixel doesn't rely on this as its dfs is 2x.

[Jun Mukai, 2014-09-16 19:28:10]

On 2014/09/16 18:47:16, oshima wrote:
>
https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
> File ash/display/display_manager.cc (left):
> 
>
https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
> ash/display/display_manager.cc:174: 
> On 2014/09/16 18:18:56, Jun Mukai wrote:
> > On 2014/09/16 17:11:42, oshima wrote:
> > > I also want to remove this, as installing 2x assets unintentionally
enabled
> > > this.
> > 
> > Removing this means allow_upgrade_to_high_dpi never gets true and may cause
> > problems on Pixel, right?
> 
> Pixel doesn't rely on this as its dfs is 2x.

Then can you remove the variable allow_upgrade_to_high_dpi itself?

[oshima, 2014-09-16 19:48:12]

On 2014/09/16 19:28:10, Jun Mukai wrote:
> On 2014/09/16 18:47:16, oshima wrote:
> >
>
https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
> > File ash/display/display_manager.cc (left):
> > 
> >
>
https://codereview.chromium.org/578553002/diff/80001/ash/display/display_mana...
> > ash/display/display_manager.cc:174: 
> > On 2014/09/16 18:18:56, Jun Mukai wrote:
> > > On 2014/09/16 17:11:42, oshima wrote:
> > > > I also want to remove this, as installing 2x assets unintentionally
> enabled
> > > > this.
> > > 
> > > Removing this means allow_upgrade_to_high_dpi never gets true and may
cause
> > > problems on Pixel, right?
> > 
> > Pixel doesn't rely on this as its dfs is 2x.
> 
> Then can you remove the variable allow_upgrade_to_high_dpi itself?

will do in separate CL. This has to be merged to 38.

[Jun Mukai, 2014-09-16 19:49:15]

okay, lgtm

[oshima, 2014-09-16 19:54:17]

The CQ bit was checked by oshima@chromium.org

[commit-bot: I haz the power, 2014-09-16 19:54:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/578553002/80001

[oshima, 2014-09-16 20:07:11]

Patchset #6 (id:100001) has been deleted

[oshima, 2014-09-16 22:59:19]

The CQ bit was checked by oshima@chromium.org

[commit-bot: I haz the power, 2014-09-16 23:01:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/578553002/80001

[commit-bot: I haz the power, 2014-09-17 01:29:16]

Committed patchset #5 (id:80001) as ad688199b94d7f66a87fbb434859f7ddb819d530

[commit-bot: I haz the power, 2014-09-17 01:29:47]

Patchset 5 (id:??) landed as
https://crrev.com/4433bc75923b6fb4718f744e934ddf5ade2db2de
Cr-Commit-Position: refs/heads/master@{#295209}