Make targetDensity-dpi account for deviceScaleFactor correctly.

Make targetDensity-dpi account for deviceScaleFactor correctly.

The fact that the deviceScaleFactor is applied unconditionally
needs to be accounted for in the targetDensity-dpi scale factor
computation.

BUG=None
TEST=WebFrameTest
R=abarth@chromium.org, aelias@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=155837

[mkosiba (inactive), 2013-08-07 17:19:47]

Adam - PTAL

+ cc: mnaganov

[abarth-chromium, 2013-08-07 18:16:16]

> TEST=WebFrameTest

^^ Which WebFrameTest fails before that passes now?  You'll probably need to
introduce a new test or at least modify an existing test to demonstrate the new
behavior.

[abarth-chromium, 2013-08-07 23:09:23]

LGTM assuming you add a test.

[mkosiba (inactive), 2013-08-08 11:22:04]

Thanks Adam! It looks like the pressure is off for cramming this CL in, so
you'll have the chance to take a look at the test before the CL goes in.

Alex - could you take a quick look as well?

[abarth-chromium, 2013-08-08 17:52:40]

LGTM.  Thanks.

[aelias_OOO_until_Jul13, 2013-08-08 18:34:37]

lgtm

https://codereview.chromium.org/22574004/diff/8001/Source/core/page/PageScale...
File Source/core/page/PageScaleConstraintsSet.cpp (right):

https://codereview.chromium.org/22574004/diff/8001/Source/core/page/PageScale...
Source/core/page/PageScaleConstraintsSet.cpp:114: // Since the return value is
multiplied by deviceScaleFactor and deviceScaleFactor is displayDPI / 160.0 the
below expands to:
I suggest deleting this comment, I find it more distracting than enlightening.

[mkosiba (inactive), 2013-08-09 09:35:25]

https://codereview.chromium.org/22574004/diff/8001/Source/core/page/PageScale...
File Source/core/page/PageScaleConstraintsSet.cpp (right):

https://codereview.chromium.org/22574004/diff/8001/Source/core/page/PageScale...
Source/core/page/PageScaleConstraintsSet.cpp:114: // Since the return value is
multiplied by deviceScaleFactor and deviceScaleFactor is displayDPI / 160.0 the
below expands to:
On 2013/08/08 18:34:37, aelias wrote:
> I suggest deleting this comment, I find it more distracting than enlightening.

Done.

[mkosiba (inactive), 2013-08-09 12:29:08]

Committed patchset #3 manually as r155837 (presubmit successful).

[f(malita), 2013-08-09 15:59:11]

On 2013/08/09 12:29:08, mkosiba wrote:
> Committed patchset #3 manually as r155837 (presubmit successful).

This broke
androidwebview_instrumentation_tests/AwTargetDensityDpiTest#testTargetDensityDpi,
PTAL:

http://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20%28dbg...

C  160s Main  [FAIL]
org.chromium.android_webview.test.AwTargetDensityDpiTest#testTargetDensityDpi:
C  160s Main  junit.framework.AssertionFailedError: expected:<360.0> but
was:<540.0>
C  160s Main  	at
org.chromium.android_webview.test.AwTargetDensityDpiTest.testTargetDensityDpi(AwTargetDensityDpiTest.java:45)
C  160s Main  	at java.lang.reflect.Method.invokeNative(Native Method)
C  160s Main  	at
android.test.InstrumentationTestCase.runMethod(InstrumentationTestCase.java:214)
C  160s Main  	at
android.test.InstrumentationTestCase.runTest(InstrumentationTestCase.java:199)
C  160s Main  	at
android.test.ActivityInstrumentationTestCase2.runTest(ActivityInstrumentationTestCase2.java:192)
C  160s Main  	at
android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:169)
C  160s Main  	at
android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:154)
C  160s Main  	at
android.test.InstrumentationTestRunner.onStart(InstrumentationTestRunner.java:545)
C  160s Main  	at
android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:1551)

[mkosiba (inactive), 2013-08-09 16:08:14]

on it, will disable test and update expectations + reenable after roll lands