Bug 88375

Summary: Settings::defaultDeviceScaleFactor is redundant with Page::deviceScaleFactor
Product: WebKit Reporter: Adam Barth <abarth>
Component: New BugsAssignee: Adam Barth <abarth>
Status: RESOLVED FIXED    
Severity: Normal CC: aelias, bdakin, danakj, dglazkov, fishd, fsamuel, jamesr, johnme, kenneth, klobag, kpiascik, rjkroege, sadrul, tkent+wkapi, webkit.review.bot
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 66687    
Attachments:
Description Flags
Work in progress
none
Patch for landing
none
Patch for landing
webkit.review.bot: commit-queue-
Archive of layout-test-results from ec2-cq-03
none
Archive of layout-test-results from ec2-cr-linux-04 none

Adam Barth
Reported 2012-06-05 16:32:28 PDT
Settings::defaultDeviceScaleFactor is redundant with Page::deviceScaleFactor
Attachments
Work in progress (12.29 KB, patch)
2012-06-05 16:36 PDT, Adam Barth 		no flags
DetailsFormatted DiffDiff
Patch for landing (13.12 KB, patch)
2012-06-06 17:03 PDT, Adam Barth 		no flags
DetailsFormatted DiffDiff
Patch for landing (14.69 KB, patch)
2012-06-06 18:23 PDT, Adam Barth 		webkit.review.bot: commit-queue-
DetailsFormatted DiffDiff
Archive of layout-test-results from ec2-cq-03 (540.30 KB, application/zip)
2012-06-07 06:30 PDT, WebKit Review Bot 		no flags
Details
Archive of layout-test-results from ec2-cr-linux-04 (485.96 KB, application/zip)
2012-06-07 06:36 PDT, WebKit Review Bot 		no flags
Details
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.
Adam Barth
Comment 1 2012-06-05 16:36:59 PDT
Created attachment 145894 [details] Work in progress
Adam Barth
Comment 2 2012-06-05 16:40:14 PDT
I'd like to offer this patch for discussion. The part that I'm least sure about is the interaction with applyDefaultDeviceScaleFactorInCompositor. There also appears to be one call site on the Chromium side for WebSettings::setDefaultDeviceScaleFactor, so I need to dig into that as well.
James Robinson
Comment 3 2012-06-05 16:44:26 PDT
Comment on attachment 145894 [details] Work in progress View in context: https://bugs.webkit.org/attachment.cgi?id=145894&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:3500 > + if (m_webSettings->applyDefaultDeviceScaleFactorInCompositor()) { > + m_deviceScaleInCompositor = page()->deviceScaleFactor(); This looks correct to me.
Dana Jansens
Comment 4 2012-06-06 10:46:14 PDT
Comment on attachment 145894 [details] Work in progress View in context: https://bugs.webkit.org/attachment.cgi?id=145894&action=review >> Source/WebKit/chromium/src/WebViewImpl.cpp:3500 >> + m_deviceScaleInCompositor = page()->deviceScaleFactor(); > > This looks correct to me. To me also. Strictly speaking, I think the (... && page()->deviceScaleFactor() == 1) check should be done still to guard the setPageScaleFactorLimits. But we are (re)moving that call in a separate CL anyhow. Should this patch rename WebSettings::applyDefaultDeviceScaleFactorInCompositor to applyDeviceScaleFactorInCompositor then?
Adam Barth
Comment 5 2012-06-06 14:26:24 PDT
> Should this patch rename WebSettings::applyDefaultDeviceScaleFactorInCompositor to applyDeviceScaleFactorInCompositor then? That sounds like a good idea, but I'd be inclined to do that in a separate patch.
Adam Barth
Comment 6 2012-06-06 14:26:59 PDT
Comment on attachment 145894 [details] Work in progress Ok. It sounds like this patch isn't too far off base, so maybe it makes sense to nominate it for a real review.
James Robinson
Comment 7 2012-06-06 16:13:00 PDT
Comment on attachment 145894 [details] Work in progress R=me (although you have some merge conflicts somewhere)
Adam Barth
Comment 8 2012-06-06 17:03:52 PDT
Created attachment 146150 [details] Patch for landing
WebKit Review Bot
Comment 9 2012-06-06 17:06:40 PDT
Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI.
Build Bot
Comment 10 2012-06-06 18:16:18 PDT
Comment on attachment 146150 [details] Patch for landing Attachment 146150 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12905979
Adam Barth
Comment 11 2012-06-06 18:19:54 PDT
9>WebKit.exp : error LNK2001: unresolved external symbol "public: void __thiscall WebCore::Settings::setDefaultDeviceScaleFactor(int)" (?setDefaultDeviceScaleFactor@Settings@WebCore@@QAEXH@Z)
Adam Barth
Comment 12 2012-06-06 18:23:46 PDT
Created attachment 146171 [details] Patch for landing
WebKit Review Bot
Comment 13 2012-06-07 06:30:35 PDT
Comment on attachment 146171 [details] Patch for landing Rejecting attachment 146171 [details] from commit-queue. New failing tests: WebFrameTest.DeviceScaleFactorUsesDefaultWithoutViewportTag Full output: http://queues.webkit.org/results/12910287
WebKit Review Bot
Comment 14 2012-06-07 06:30:40 PDT
Created attachment 146274 [details] Archive of layout-test-results from ec2-cq-03 The attached test failures were seen while running run-webkit-tests on the commit-queue. Bot: ec2-cq-03 Port: <class 'webkitpy.common.config.ports.ChromiumXVFBPort'> Platform: Linux-2.6.35-28-virtual-x86_64-with-Ubuntu-10.10-maverick
WebKit Review Bot
Comment 15 2012-06-07 06:36:19 PDT
Comment on attachment 146171 [details] Patch for landing Attachment 146171 [details] did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/12923008 New failing tests: WebFrameTest.DeviceScaleFactorUsesDefaultWithoutViewportTag
WebKit Review Bot
Comment 16 2012-06-07 06:36:30 PDT
Created attachment 146276 [details] Archive of layout-test-results from ec2-cr-linux-04 The attached test failures were seen while running run-webkit-tests on the chromium-ews. Bot: ec2-cr-linux-04 Port: <class 'webkitpy.common.config.ports.ChromiumXVFBPort'> Platform: Linux-2.6.35-28-virtual-x86_64-with-Ubuntu-10.10-maverick
Adam Barth
Comment 17 2012-06-07 14:21:37 PDT
Committed r119752: <http://trac.webkit.org/changeset/119752>
Note You need to log in before you can comment on or make changes to this bug.