110218 2013-02-19 07:02:17 -0800 [WK2] Make WebPageProxy use deviceScaleFactor() in creationParameters(). 2013-05-14 04:31:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 michael.bruning michael.bruning abecsi bdakin cmarcelo gyuyoung.kim hausmann jturcotte kenneth menard rakuco webkit.review.bot oldest_to_newest 836354 0 michael.bruning 2013-02-19 07:02:17 -0800 [WK2] Make WebPageProxy use deviceScaleFactor() in creationParamaters(). 836355 1 189081 michael.bruning 2013-02-19 07:03:11 -0800 Created attachment 189081 Patch 836362 2 michael.bruning 2013-02-19 07:10:15 -0800 CCing Beth as she was the last author working on this in WebPageProxy as well as Simon and Kenneth for Qt resp. EFL. 836367 3 189081 abecsi 2013-02-19 07:19:08 -0800 Comment on attachment 189081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189081&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:-3732 > - parameters.deviceScaleFactor = m_intrinsicDeviceScaleFactor; As Jocelyn pointed out earlier in the first patch to https://bugs.webkit.org/show_bug.cgi?id=97908, the custom device scale factor was designed to only be used temporary. Maybe we should add C API for setting the intrinsic device scale factor and use that at least for the Qt case, where we get the scale factor from the underlying platform window? 836373 4 189086 michael.bruning 2013-02-19 07:22:55 -0800 Created attachment 189086 Patch Fixed typo in bug title and ChangeLog text. 836388 5 michael.bruning 2013-02-19 07:44:25 -0800 (In reply to comment #3) > (From update of attachment 189081 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189081&action=review > > > Source/WebKit2/UIProcess/WebPageProxy.cpp:-3732 > > - parameters.deviceScaleFactor = m_intrinsicDeviceScaleFactor; > > As Jocelyn pointed out earlier in the first patch to https://bugs.webkit.org/show_bug.cgi?id=97908, the custom device scale factor was designed to only be used temporary. > Maybe we should add C API for setting the intrinsic device scale factor and use that at least for the Qt case, where we get the scale factor from the underlying platform window? Hm, while there is no real technical reason to use the custom scale factor for temporary views only, I agree that using it like we do in this patch pretty much renders the intrinsic device scale factor pointless / makes it a de-facto constant in the Efl and Qt ports. I am fine with adding the C API for setting the intrinsic scale too if this is preferable from the API owners' point of view. Let's wait for comments :). 836402 6 abecsi 2013-02-19 08:02:45 -0800 (In reply to comment #5) > (In reply to comment #3) > > (From update of attachment 189081 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=189081&action=review > > > > > Source/WebKit2/UIProcess/WebPageProxy.cpp:-3732 > > > - parameters.deviceScaleFactor = m_intrinsicDeviceScaleFactor; > > > > As Jocelyn pointed out earlier in the first patch to https://bugs.webkit.org/show_bug.cgi?id=97908, the custom device scale factor was designed to only be used temporary. > > Maybe we should add C API for setting the intrinsic device scale factor and use that at least for the Qt case, where we get the scale factor from the underlying platform window? > > Hm, while there is no real technical reason to use the custom scale factor for temporary views only, I agree that using it like we do in this patch pretty much renders the intrinsic device scale factor pointless / makes it a de-facto constant in the Efl and Qt ports. I am fine with adding the C API for setting the intrinsic scale too if this is preferable from the API owners' point of view. Let's wait for comments :). I think the point of the custom device pixel ratio would be to temporarily set a device pixel ratio that's different from the intrinsic one for example for testing purposes. Qt right now does not have a mechanism to set a custom scale factor different from the underlying platform window, thus I think we should set the intrinsic device pixel ratio instead of misusing the custom one. 888775 7 michael.bruning 2013-05-14 04:31:37 -0700 Committed r150063: <http://trac.webkit.org/changeset/150063> 189081 2013-02-19 07:03:11 -0800 2013-02-19 07:22:51 -0800 Patch bug-110218-20130219155932.patch text/plain 4232 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmQxYmJmMWY4NjFjODUz MDU5YjkzMWY1Yzc3MGMyYzUzZTQzMTI1YS4uMGExOTA3MmQ0YjljYTk1MDk5OGZhNjY0ZDEwMjJj M2UzMGNjOWFlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTE5ICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbT4KKworICAgICAgICBbV0sy XSBNYWtlIFdlYlBhZ2VQcm94eSB1c2UgZGV2aWNlU2NhbGVGYWN0b3IoKSBpbiBjcmVhdGlvblBh cmFtYXRlcnMoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMDIxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgdGhlIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWF0ZXJzIHVzZSB0aGUgYWNj ZXNzb3IKKyAgICAgICAgZGV2aWNlU2NhbGVGYWN0b3IoKSBpbnN0ZWFkIG9mIHVzaW5nIG1faW50 cmluc2ljRGV2aWNTY2FsZUZhY3RvcgorICAgICAgICBkaXJlY3RseS4gVGhpcyB3aWxsIHJlc3Rv cmUgdGhlIGN1c3RvbSBkZXZpY2Ugc2NhbGUgZmFjdG9yIHdoZW4KKyAgICAgICAgcmVhdHRhY2hp bmcgdG8gdGhlIFdlYlByb2Nlc3MgYWZ0ZXIgYSBjcmFzaC4KKworICAgICAgICBNb3Jlb3Zlciwg aXQgd2lsbCBlbmFibGUgdGhlIFF0IGFuZCBFTEYgcG9ydHMgdG8gdXNlIHRoZQorICAgICAgICBl eGlzdGluZyBDIEFQSSBmb3Igb3ZlcnJpZGluZyB0aGUgZGV2aWNlIHNjYWxlIGZhY3RvciBpbnN0 ZWFkCisgICAgICAgIG9mIHVzaW5nIHRoZSBXZWJQYWdlUHJveHkgZGlyZWN0bHkgb3IgYWRkaW5n IG5ldyBDIEFQSSB0byBzZXQKKyAgICAgICAgdGhlIGludHJpbnNpYyBkZXZpY2Ugc2NhbGUgZmFj dG9yLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAg IChFd2tWaWV3OjpzZXREZXZpY2VTY2FsZUZhY3Rvcik6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlBhZ2U6OnVwZGF0ZVBh aW50Tm9kZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKwogMjAxMy0wMi0x OCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dUS10gUmVtb3ZlIHdlYmtpdF93ZWJfdmlld19nZXRfc3VicmVzb3VyY2VzIGZyb20gV2ViS2l0 MiBHVEsrIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNw cAppbmRleCAwYWU2YzU2MjkxZWNhNjk1OTliYjIzZDczY2Y0NDcwNDhhMjY4MjU4Li5hMTI2Nzgw Y2M1OGY0OTAyNzI4NTQwYTY5NTJmYTFhZDIwYjRlZWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcApAQCAtNDUzLDcgKzQ1Myw3IEBAIHZvaWQgRXdr Vmlldzo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYgY3Vyc29yKQogCiB2b2lkIEV3a1ZpZXc6OnNl dERldmljZVNjYWxlRmFjdG9yKGZsb2F0IHNjYWxlKQogewotICAgIHBhZ2UoKS0+c2V0SW50cmlu c2ljRGV2aWNlU2NhbGVGYWN0b3Ioc2NhbGUpOworICAgIFdLUGFnZVNldEN1c3RvbUJhY2tpbmdT Y2FsZUZhY3Rvcih3a1BhZ2UoKSwgc2NhbGUpOwogfQogCiBmbG9hdCBFd2tWaWV3OjpkZXZpY2VT Y2FsZUZhY3RvcigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJwYWdlLmNwcAppbmRleCA0ZjE5NmUxMzlhMjExMDJlNGQwNTY5ZmZiMzgzMWFi YzhjZDhhYjkyLi5mOTQzOWMzZjU2MDhmNjRhMDEzZDg1MzAzMjBlNTQ0NWE2YmZhMmZkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAK QEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJxcXVpY2t3ZWJ2aWV3X3AuaCIKICNpbmNsdWRl ICJxd2Via2l0dGVzdF9wLmgiCiAjaW5jbHVkZSA8UVF1aWNrV2luZG93PgorI2luY2x1ZGUgPFdL UGFnZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmg+CiAK IHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC05NSw4ICs5Niw5IEBAIFFTR05vZGUqIFFRdWlj a1dlYlBhZ2U6OnVwZGF0ZVBhaW50Tm9kZShRU0dOb2RlKiBvbGROb2RlLCBVcGRhdGVQYWludE5v ZGVEYXRhKikKICAgICBjb25zdCBRV2luZG93KiB3aW5kb3cgPSB0aGlzLT53aW5kb3coKTsKICAg ICBBU1NFUlQod2luZG93KTsKIAotICAgIGlmICh3aW5kb3cgJiYgZC0+d2ViUGFnZVByb3h5LT5k ZXZpY2VTY2FsZUZhY3RvcigpICE9IHdpbmRvdy0+ZGV2aWNlUGl4ZWxSYXRpbygpKSB7Ci0gICAg ICAgIGQtPndlYlBhZ2VQcm94eS0+c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3Iod2luZG93 LT5kZXZpY2VQaXhlbFJhdGlvKCkpOworICAgIFdLUGFnZVJlZiBwYWdlUmVmID0gdG9BUEkoZC0+ d2ViUGFnZVByb3h5KTsKKyAgICBpZiAod2luZG93ICYmIFdLUGFnZUdldEJhY2tpbmdTY2FsZUZh Y3RvcihwYWdlUmVmKSAhPSB3aW5kb3ctPmRldmljZVBpeGVsUmF0aW8oKSkgeworICAgICAgICBX S1BhZ2VTZXRDdXN0b21CYWNraW5nU2NhbGVGYWN0b3IocGFnZVJlZiwgd2luZG93LT5kZXZpY2VQ aXhlbFJhdGlvKCkpOwogICAgICAgICAvLyBUaGlzIHNpZ25hbCBpcyBxdWV1ZWQgc2luY2UgaWYg d2UgYXJlIHJ1bm5pbmcgYSB0aHJlYWRlZCByZW5kZXJlci4gVGhpcyBtaWdodCBjYXVzZSBmYWls dXJlcwogICAgICAgICAvLyBpZiB0ZXN0cyBhcmUgcmVhZGluZyB0aGUgbmV3IHZhbHVlIGJldHdl ZW4gdGhlIHByb3BlcnR5IGNoYW5nZSBhbmQgdGhlIHNpZ25hbCBlbWlzc2lvbi4KICAgICAgICAg ZW1pdCBkLT52aWV3cG9ydEl0ZW0tPmV4cGVyaW1lbnRhbCgpLT50ZXN0KCktPmRldmljZVBpeGVs UmF0aW9DaGFuZ2VkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CmluZGV4IDlkOGEzNThmMjk2NGMxYjIxMjZhYjU4NGY3ZjE5Y2MwMDlhZmQxNTEuLjFiODA3NjA1 YTM0ZTIzMzcwNTE3ZjE2ZDE0NGU2OThjY2QxZmI2MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0zNzI5LDcgKzM3MjksNyBAQCBXZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkgY29uc3QKICAg ICBwYXJhbWV0ZXJzLmhpZ2hlc3RVc2VkQmFja0ZvcndhcmRJdGVtSUQgPSBXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtOjpoaWdoZWRVc2VkSXRlbUlEKCk7CiAgICAgcGFyYW1ldGVycy5jYW5SdW5CZWZv cmVVbmxvYWRDb25maXJtUGFuZWwgPSBtX3VpQ2xpZW50LmNhblJ1bkJlZm9yZVVubG9hZENvbmZp cm1QYW5lbCgpOwogICAgIHBhcmFtZXRlcnMuY2FuUnVuTW9kYWwgPSBtX2NhblJ1bk1vZGFsOwot ICAgIHBhcmFtZXRlcnMuZGV2aWNlU2NhbGVGYWN0b3IgPSBtX2ludHJpbnNpY0RldmljZVNjYWxl RmFjdG9yOworICAgIHBhcmFtZXRlcnMuZGV2aWNlU2NhbGVGYWN0b3IgPSBkZXZpY2VTY2FsZUZh Y3RvcigpOwogICAgIHBhcmFtZXRlcnMubWVkaWFWb2x1bWUgPSBtX21lZGlhVm9sdW1lOwogICAg IHBhcmFtZXRlcnMubWF5U3RhcnRNZWRpYVdoZW5JbldpbmRvdyA9IG1fbWF5U3RhcnRNZWRpYVdo ZW5JbldpbmRvdzsKIAo= 189086 2013-02-19 07:22:55 -0800 2013-05-13 18:43:46 -0700 Patch bug-110218-20130219161917.patch text/plain 4233 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmQxYmJmMWY4NjFjODUz MDU5YjkzMWY1Yzc3MGMyYzUzZTQzMTI1YS4uN2ZhYjYxYzczYjUwMGY3NWFlOWNlMzlhZThlNzMx YzY1ZTMxN2RiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTE5ICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbT4KKworICAgICAgICBbV0sy XSBNYWtlIFdlYlBhZ2VQcm94eSB1c2UgZGV2aWNlU2NhbGVGYWN0b3IoKSBpbiBjcmVhdGlvblBh cmFtZXRlcnMoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMDIxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgdGhlIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzIHVzZSB0aGUgYWNj ZXNzb3IKKyAgICAgICAgZGV2aWNlU2NhbGVGYWN0b3IoKSBpbnN0ZWFkIG9mIHVzaW5nIG1faW50 cmluc2ljRGV2aWNlU2NhbGVGYWN0b3IKKyAgICAgICAgZGlyZWN0bHkuIFRoaXMgd2lsbCByZXN0 b3JlIHRoZSBjdXN0b20gZGV2aWNlIHNjYWxlIGZhY3RvciB3aGVuCisgICAgICAgIHJlYXR0YWNo aW5nIHRvIHRoZSBXZWJQcm9jZXNzIGFmdGVyIGEgY3Jhc2guCisKKyAgICAgICAgTW9yZW92ZXIs IGl0IHdpbGwgZW5hYmxlIHRoZSBRdCBhbmQgRUxGIHBvcnRzIHRvIHVzZSB0aGUKKyAgICAgICAg ZXhpc3RpbmcgQyBBUEkgZm9yIG92ZXJyaWRpbmcgdGhlIGRldmljZSBzY2FsZSBmYWN0b3IgaW5z dGVhZAorICAgICAgICBvZiB1c2luZyB0aGUgV2ViUGFnZVByb3h5IGRpcmVjdGx5IG9yIGFkZGlu ZyBuZXcgQyBBUEkgdG8gc2V0CisgICAgICAgIHRoZSBpbnRyaW5zaWMgZGV2aWNlIHNjYWxlIGZh Y3Rvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwOgorICAgICAg ICAoRXdrVmlldzo6c2V0RGV2aWNlU2NhbGVGYWN0b3IpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2VicGFnZS5jcHA6CisgICAgICAgIChRUXVpY2tXZWJQYWdlOjp1cGRhdGVQ YWludE5vZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisKIDIwMTMtMDIt MTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtHVEtdIFJlbW92ZSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3N1YnJlc291cmNlcyBmcm9tIFdlYktp dDIgR1RLKyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L0V3a1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5j cHAKaW5kZXggMGFlNmM1NjI5MWVjYTY5NTk5YmIyM2Q3M2NmNDQ3MDQ4YTI2ODI1OC4uYTEyNjc4 MGNjNThmNDkwMjcyODU0MGE2OTUyZmExYWQyMGI0ZWVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKQEAgLTQ1Myw3ICs0NTMsNyBAQCB2b2lkIEV3 a1ZpZXc6OnNldEN1cnNvcihjb25zdCBDdXJzb3ImIGN1cnNvcikKIAogdm9pZCBFd2tWaWV3Ojpz ZXREZXZpY2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZSkKIHsKLSAgICBwYWdlKCktPnNldEludHJp bnNpY0RldmljZVNjYWxlRmFjdG9yKHNjYWxlKTsKKyAgICBXS1BhZ2VTZXRDdXN0b21CYWNraW5n U2NhbGVGYWN0b3Iod2tQYWdlKCksIHNjYWxlKTsKIH0KIAogZmxvYXQgRXdrVmlldzo6ZGV2aWNl U2NhbGVGYWN0b3IoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXF1aWNrd2VicGFnZS5jcHAKaW5kZXggNGYxOTZlMTM5YTIxMTAyZTRkMDU2OWZmYjM4MzFh YmM4Y2Q4YWI5Mi4uZjk0MzljM2Y1NjA4ZjY0YTAxM2Q4NTMwMzIwZTU0NDVhNmJmYTJmZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3Bw CkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wLmgiCiAjaW5jbHVk ZSAicXdlYmtpdHRlc3RfcC5oIgogI2luY2x1ZGUgPFFRdWlja1dpbmRvdz4KKyNpbmNsdWRlIDxX S1BhZ2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5oPgog CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwpAQCAtOTUsOCArOTYsOSBAQCBRU0dOb2RlKiBRUXVp Y2tXZWJQYWdlOjp1cGRhdGVQYWludE5vZGUoUVNHTm9kZSogb2xkTm9kZSwgVXBkYXRlUGFpbnRO b2RlRGF0YSopCiAgICAgY29uc3QgUVdpbmRvdyogd2luZG93ID0gdGhpcy0+d2luZG93KCk7CiAg ICAgQVNTRVJUKHdpbmRvdyk7CiAKLSAgICBpZiAod2luZG93ICYmIGQtPndlYlBhZ2VQcm94eS0+ ZGV2aWNlU2NhbGVGYWN0b3IoKSAhPSB3aW5kb3ctPmRldmljZVBpeGVsUmF0aW8oKSkgewotICAg ICAgICBkLT53ZWJQYWdlUHJveHktPnNldEludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yKHdpbmRv dy0+ZGV2aWNlUGl4ZWxSYXRpbygpKTsKKyAgICBXS1BhZ2VSZWYgcGFnZVJlZiA9IHRvQVBJKGQt PndlYlBhZ2VQcm94eSk7CisgICAgaWYgKHdpbmRvdyAmJiBXS1BhZ2VHZXRCYWNraW5nU2NhbGVG YWN0b3IocGFnZVJlZikgIT0gd2luZG93LT5kZXZpY2VQaXhlbFJhdGlvKCkpIHsKKyAgICAgICAg V0tQYWdlU2V0Q3VzdG9tQmFja2luZ1NjYWxlRmFjdG9yKHBhZ2VSZWYsIHdpbmRvdy0+ZGV2aWNl UGl4ZWxSYXRpbygpKTsKICAgICAgICAgLy8gVGhpcyBzaWduYWwgaXMgcXVldWVkIHNpbmNlIGlm IHdlIGFyZSBydW5uaW5nIGEgdGhyZWFkZWQgcmVuZGVyZXIuIFRoaXMgbWlnaHQgY2F1c2UgZmFp bHVyZXMKICAgICAgICAgLy8gaWYgdGVzdHMgYXJlIHJlYWRpbmcgdGhlIG5ldyB2YWx1ZSBiZXR3 ZWVuIHRoZSBwcm9wZXJ0eSBjaGFuZ2UgYW5kIHRoZSBzaWduYWwgZW1pc3Npb24uCiAgICAgICAg IGVtaXQgZC0+dmlld3BvcnRJdGVtLT5leHBlcmltZW50YWwoKS0+dGVzdCgpLT5kZXZpY2VQaXhl bFJhdGlvQ2hhbmdlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAppbmRleCA5ZDhhMzU4ZjI5NjRjMWIyMTI2YWI1ODRmN2YxOWNjMDA5YWZkMTUxLi4xYjgwNzYw NWEzNGUyMzM3MDUxN2YxNmQxNDRlNjk4Y2NkMWZiNjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzcyOSw3ICszNzI5LDcgQEAgV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycygpIGNvbnN0CiAg ICAgcGFyYW1ldGVycy5oaWdoZXN0VXNlZEJhY2tGb3J3YXJkSXRlbUlEID0gV2ViQmFja0Zvcndh cmRMaXN0SXRlbTo6aGlnaGVkVXNlZEl0ZW1JRCgpOwogICAgIHBhcmFtZXRlcnMuY2FuUnVuQmVm b3JlVW5sb2FkQ29uZmlybVBhbmVsID0gbV91aUNsaWVudC5jYW5SdW5CZWZvcmVVbmxvYWRDb25m aXJtUGFuZWwoKTsKICAgICBwYXJhbWV0ZXJzLmNhblJ1bk1vZGFsID0gbV9jYW5SdW5Nb2RhbDsK LSAgICBwYXJhbWV0ZXJzLmRldmljZVNjYWxlRmFjdG9yID0gbV9pbnRyaW5zaWNEZXZpY2VTY2Fs ZUZhY3RvcjsKKyAgICBwYXJhbWV0ZXJzLmRldmljZVNjYWxlRmFjdG9yID0gZGV2aWNlU2NhbGVG YWN0b3IoKTsKICAgICBwYXJhbWV0ZXJzLm1lZGlhVm9sdW1lID0gbV9tZWRpYVZvbHVtZTsKICAg ICBwYXJhbWV0ZXJzLm1heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3cgPSBtX21heVN0YXJ0TWVkaWFX aGVuSW5XaW5kb3c7CiAK