146792 2015-07-09 10:29:41 -0700 [Win] Honor CACFLayer content scale factor 2015-07-09 11:10:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham commit-queue simon.fraser oldest_to_newest 1108230 0 bfulgham 2015-07-09 10:29:41 -0700 If we have access to CACFLayer's content scale factor, keep it in sync with the state of our WebCore scale factor. This does not currently have any user visible impact, but is a necessary first step for High DPI support. 1108232 1 256486 bfulgham 2015-07-09 10:34:42 -0700 Created attachment 256486 Patch 1108248 2 bfulgham 2015-07-09 11:10:49 -0700 Committed r186594: <http://trac.webkit.org/changeset/186594> 256486 2015-07-09 10:34:42 -0700 2015-07-09 11:06:21 -0700 Patch bug-146792-20150709104734.patch text/plain 5689 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjU5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA3LTA5ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEhvbm9yIENBQ0ZM YXllciBjb250ZW50IHNjYWxlIGZhY3RvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2NzkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBBVkZvdW5kYXRpb25TdXBwb3J0LnB5OiBDaGVjayBmb3IgdGhl IENBQ0ZMYXllclNldC9HZXRDb250ZW50c1NjYWxlCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2Evd2luL1BsYXRmb3JtQ0FMYXllcldpbi5jcHA6CisgICAgICAgIChQbGF0Zm9ybUNBTGF5 ZXJXaW46OlBsYXRmb3JtQ0FMYXllcldpbik6IFVzZSBvd25lcidzIHNjYWxlIGZhY3RvciAoaWYK KyAgICAgICAgcHJlc2VudCkuCisgICAgICAgIChQbGF0Zm9ybUNBTGF5ZXJXaW46OmNvbnRlbnRz U2NhbGUpOiBVc2UgQ0FDRkxheWVyIEFQSSBpZiBwcmVzZW50LgorICAgICAgICAoUGxhdGZvcm1D QUxheWVyV2luOjpzZXRDb250ZW50c1NjYWxlKTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXllcldpbkludGVybmFsLmNwcDoKKyAgICAgICAg KFBsYXRmb3JtQ0FMYXllcldpbkludGVybmFsOjpQbGF0Zm9ybUNBTGF5ZXJXaW5JbnRlcm5hbCk6 IFVzZSBvd25lcidzIHNjYWxlCisgICAgICAgIGZhY3RvciAoaWYgcHJlc2VudCkuCisgICAgICAg IChQbGF0Zm9ybUNBTGF5ZXJXaW5JbnRlcm5hbDo6YWRkVGlsZSk6IFVzZSB0aWxlIHBhcmVudCdz IHNjYWxlIGZhY3Rvci4KKwogMjAxNS0wNy0wOCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBsZS5j b20+CiAKICAgICAgICAgTWVkaWEgU2Vzc2lvbjogcmVwb3J0IHRvIGNocm9tZSBjbGllbnQgJ2hh c0FjdGl2ZU1lZGlhRWxlbWVudHMnIGNoYW5nZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0FWRm91 bmRhdGlvblN1cHBvcnQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQVZGb3VuZGF0 aW9uU3VwcG9ydC5weQkocmV2aXNpb24gMTg2NTkzKQorKysgU291cmNlL1dlYkNvcmUvQVZGb3Vu ZGF0aW9uU3VwcG9ydC5weQkod29ya2luZyBjb3B5KQpAQCAtNTMsMyArNTMsNyBAQCBpZiBsb29r Rm9yKCIvaW5jbHVkZS9BVkZvdW5kYXRpb25DRi9BVkNGCiAgICAgcmVnZXhwID0gcmUuY29tcGls ZSgiQVZDRlVSTEFzc2V0SXNQbGF5YWJsZUV4dGVuZGVkTUlNRVR5cGUiKQogICAgIGlmIGZpbGVD b250YWlucygiL2luY2x1ZGUvQVZGb3VuZGF0aW9uQ0YvQVZDRkFzc2V0LmgiLCByZWdleHApOgog ICAgICAgICBwcmludCAiI2RlZmluZSBIQVZFX0FWQ0ZVUkxfUExBWUFCTEVfTUlNRVRZUEUgMSIK K2lmIGxvb2tGb3IoIi9pbmNsdWRlL1F1YXJ0ekNvcmUvQ0FDRkxheWVyLmgiKToKKyAgICByZWdl eHAgPSByZS5jb21waWxlKCJDQUNGTGF5ZXJTZXRDb250ZW50c1NjYWxlIikKKyAgICBpZiBmaWxl Q29udGFpbnMoIi9pbmNsdWRlL1F1YXJ0ekNvcmUvQ0FDRkxheWVyLmgiLCByZWdleHApOgorICAg ICAgICBwcmludCAiI2RlZmluZSBIQVZFX0NBQ0ZMQVlFUl9TRVRDT05URU5UU1NDQUxFIDEiCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vUGxhdGZvcm1DQUxh eWVyV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS93aW4vUGxhdGZvcm1DQUxheWVyV2luLmNwcAkocmV2aXNpb24gMTg2NTkzKQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXllcldpbi5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAy MDExLCAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAo QykgMjAxMSwgMjAxNC0yMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIlBs YXRmb3JtQ0FBbmltYXRpb25XaW4uaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNBTGF5ZXJXaW5JbnRl cm5hbC5oIgogI2luY2x1ZGUgIlRpbGVDb250cm9sbGVyLmgiCisjaW5jbHVkZSAiV2ViQ29yZUhl YWRlckRldGVjdGlvbi5oIgogI2luY2x1ZGUgPFF1YXJ0ekNvcmUvQ29yZUFuaW1hdGlvbkNGLmg+ CiAjaW5jbHVkZSA8V2ViS2l0U3lzdGVtSW50ZXJmYWNlL1dlYktpdFN5c3RlbUludGVyZmFjZS5o PgogI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgpAQCAtMTM2LDYgKzEzNywxMCBAQCBQbGF0 Zm9ybUNBTGF5ZXJXaW46OlBsYXRmb3JtQ0FMYXllcldpbihMCiAKICAgICBtX2xheWVyID0gYWRv cHRDRihDQUNGTGF5ZXJDcmVhdGUodG9DQUNGTGF5ZXJUeXBlKGxheWVyVHlwZSkpKTsKIAorI2lm IEhBVkUoQ0FDRkxBWUVSX1NFVENPTlRFTlRTU0NBTEUpCisgICAgQ0FDRkxheWVyU2V0Q29udGVu dHNTY2FsZShtX2xheWVyLmdldCgpLCBvd25lciA/IG93bmVyLT5wbGF0Zm9ybUNBTGF5ZXJEZXZp Y2VTY2FsZUZhY3RvcigpIDogMS4wZik7CisjZW5kaWYKKwogICAgIC8vIENyZWF0ZSB0aGUgUGxh dGZvcm1DQUxheWVyV2luSW50ZXJuYWwgb2JqZWN0IGFuZCBwb2ludCB0byBpdCBpbiB0aGUgdXNl cmRhdGEuCiAgICAgUGxhdGZvcm1DQUxheWVyV2luSW50ZXJuYWwqIGludGVybiA9IG5ldyBQbGF0 Zm9ybUNBTGF5ZXJXaW5JbnRlcm5hbCh0aGlzKTsKICAgICBDQUNGTGF5ZXJTZXRVc2VyRGF0YSht X2xheWVyLmdldCgpLCBpbnRlcm4pOwpAQCAtNTgyLDExICs1ODcsMTggQEAgdm9pZCBQbGF0Zm9y bUNBTGF5ZXJXaW46OnNldEVkZ2VBbnRpYWxpYQogCiBmbG9hdCBQbGF0Zm9ybUNBTGF5ZXJXaW46 OmNvbnRlbnRzU2NhbGUoKSBjb25zdAogewotICAgIHJldHVybiAxOworI2lmIEhBVkUoQ0FDRkxB WUVSX1NFVENPTlRFTlRTU0NBTEUpCisgICAgcmV0dXJuIENBQ0ZMYXllckdldENvbnRlbnRzU2Nh bGUobV9sYXllci5nZXQoKSk7CisjZWxzZQorICAgIHJldHVybiAxLjBmOworI2VuZGlmCiB9CiAK LXZvaWQgUGxhdGZvcm1DQUxheWVyV2luOjpzZXRDb250ZW50c1NjYWxlKGZsb2F0KQotewordm9p ZCBQbGF0Zm9ybUNBTGF5ZXJXaW46OnNldENvbnRlbnRzU2NhbGUoZmxvYXQgc2NhbGVGYWN0b3Ip Cit7CisjaWYgSEFWRShDQUNGTEFZRVJfU0VUQ09OVEVOVFNTQ0FMRSkKKyAgICBDQUNGTGF5ZXJT ZXRDb250ZW50c1NjYWxlKG1fbGF5ZXIuZ2V0KCksIHNjYWxlRmFjdG9yKTsKKyNlbmRpZgogfQog CiBmbG9hdCBQbGF0Zm9ybUNBTGF5ZXJXaW46OmNvcm5lclJhZGl1cygpIGNvbnN0CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vUGxhdGZvcm1DQUxheWVyV2lu SW50ZXJuYWwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhL3dpbi9QbGF0Zm9ybUNBTGF5ZXJXaW5JbnRlcm5hbC5jcHAJKHJldmlzaW9uIDE4NjU5 MykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL3dpbi9QbGF0Zm9ybUNB TGF5ZXJXaW5JbnRlcm5hbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgot ICogQ29weXJpZ2h0IChDKSAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAxMSwgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNs dWRlICJUZXh0UnVuLmgiCiAjaW5jbHVkZSAiVGlsZUNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJU aWxlZEJhY2tpbmcuaCIKKyNpbmNsdWRlICJXZWJDb3JlSGVhZGVyRGV0ZWN0aW9uLmgiCiAjaW5j bHVkZSA8UXVhcnR6Q29yZS9DQUNGTGF5ZXIuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5o PgogCkBAIC02MCw2ICs2MSwxMCBAQCBQbGF0Zm9ybUNBTGF5ZXJXaW5JbnRlcm5hbDo6UGxhdGZv cm1DQUxhCiAgICAgICAgIC8vIFRpbGVkIGxheWVycyBhcmUgcGxhY2VkIGluIGEgY2hpbGQgbGF5 ZXIgdGhhdCBpcyBhbHdheXMgdGhlIGZpcnN0IGNoaWxkIG9mIHRoZSBUaWxlZExheWVyCiAgICAg ICAgIG1fdGlsZVBhcmVudCA9IGFkb3B0Q0YoQ0FDRkxheWVyQ3JlYXRlKGtDQUNGTGF5ZXIpKTsK ICAgICAgICAgQ0FDRkxheWVySW5zZXJ0U3VibGF5ZXIobV9vd25lci0+cGxhdGZvcm1MYXllcigp LCBtX3RpbGVQYXJlbnQuZ2V0KCksIDApOworI2lmIEhBVkUoQ0FDRkxBWUVSX1NFVENPTlRFTlRT U0NBTEUpCisgICAgICAgIENBQ0ZMYXllclNldENvbnRlbnRzU2NhbGUobV90aWxlUGFyZW50Lmdl dCgpLCBDQUNGTGF5ZXJHZXRDb250ZW50c1NjYWxlKG1fb3duZXItPnBsYXRmb3JtTGF5ZXIoKSkp OworI2VuZGlmCisKICAgICAgICAgdXBkYXRlVGlsZXMoKTsKICAgICB9CiB9CkBAIC00MjAsNiAr NDI1LDkgQEAgdm9pZCBQbGF0Zm9ybUNBTGF5ZXJXaW5JbnRlcm5hbDo6YWRkVGlsZQogICAgIENB Q0ZMYXllclNldEFuY2hvclBvaW50KG5ld0xheWVyLmdldCgpLCBDR1BvaW50TWFrZSgwLCAxKSk7 CiAgICAgQ0FDRkxheWVyU2V0VXNlckRhdGEobmV3TGF5ZXIuZ2V0KCksIHRoaXMpOwogICAgIENB Q0ZMYXllclNldERpc3BsYXlDYWxsYmFjayhuZXdMYXllci5nZXQoKSwgdGlsZURpc3BsYXlDYWxs YmFjayk7CisjaWYgSEFWRShDQUNGTEFZRVJfU0VUQ09OVEVOVFNTQ0FMRSkKKyAgICBDQUNGTGF5 ZXJTZXRDb250ZW50c1NjYWxlKG5ld0xheWVyLmdldCgpLCBDQUNGTGF5ZXJHZXRDb250ZW50c1Nj YWxlKG1fdGlsZVBhcmVudC5nZXQoKSkpOworI2VuZGlmCiAKICAgICBDRkFycmF5UmVmIHN1Ymxh eWVycyA9IENBQ0ZMYXllckdldFN1YmxheWVycyhtX3RpbGVQYXJlbnQuZ2V0KCkpOwogICAgIENB Q0ZMYXllckluc2VydFN1YmxheWVyKG1fdGlsZVBhcmVudC5nZXQoKSwgbmV3TGF5ZXIuZ2V0KCks IHN1YmxheWVycyA/IENGQXJyYXlHZXRDb3VudChzdWJsYXllcnMpIDogMCk7Cg==