118521 2013-07-09 19:04:15 -0700 [EFL] Add ewk_view_device_pixel_ratio_set 2013-07-09 20:34:49 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ryuan.choi ryuan.choi cdumez commit-queue esprehn+autocc gyuyoung.kim kangil.han lucas.de.marchi rakuco oldest_to_newest 907253 0 ryuan.choi 2013-07-09 19:04:15 -0700 Now, ewebkit and ewebkit2 have different approach about getting device pixel ratio. ewebkit depends on deprecatedTargetDPI and ecore_x_dpi_get but ewebkit2 use Page::deviceScaleFactor. 907255 1 206361 ryuan.choi 2013-07-09 19:36:17 -0700 Created attachment 206361 Patch 907256 2 206361 gyuyoung.kim 2013-07-09 20:06:25 -0700 Comment on attachment 206361 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206361&action=review Looks OK. > Tools/EWebLauncher/main.c:153 > + double device_pixel_ratio; Isn't float more clear ? 907261 3 ryuan.choi 2013-07-09 20:33:55 -0700 Committed r152523: <http://trac.webkit.org/changeset/152523> 907262 4 ryuan.choi 2013-07-09 20:34:36 -0700 (In reply to comment #2) > (From update of attachment 206361 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=206361&action=review > > Looks OK. > > > Tools/EWebLauncher/main.c:153 > > + double device_pixel_ratio; > > Isn't float more clear ? Landed after fixed like you mentioned. Thank you 206361 2013-07-09 19:36:17 -0700 2013-07-09 20:34:49 -0700 Patch bug-118521-20130710113402.patch text/plain 14197 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWVjMmE0ODkwNGE3MDQy MDFjN2NhMzYyZTgwNzFlZDAzN2RkMWM2Yi4uNjMyNTdiZWU0MWM4NWZlZGM2YjUxMjg2NjliNTM0 Y2UzZDBkNmMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA3LTA5ICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBBZGQgZXdr X3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4NTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRl c3RzLgorCisgICAgICAgICogZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNwcDogUmVtb3ZlIFBMQVRG T1JNKEVGTCkgbm90IHRvIHVzZSBkZXByZWNhdGVkVGFyZ2V0RFBJCisgICAgICAgICogZG9tL1Zp ZXdwb3J0QXJndW1lbnRzLmg6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9FZmxTY3Jl ZW5VdGlsaXRpZXMuY3BwOiBSZW1vdmVkIGdldERQSSgpIHdoaWNoIGlzIG5vdCB1c2VkIGFueW1v cmUuCisgICAgICAgICogcGxhdGZvcm0vZWZsL0VmbFNjcmVlblV0aWxpdGllcy5oOiBEaXR0by4K KwogMjAxMy0wNy0wOSAgSmVmZiBNaWxsZXIgIDxqZWZmbUBhcHBsZS5jb20+CiAKICAgICAgICAg QXV0aGVudGljYXRpb25NYWMubW0gZG9lcyBub3QgaGFuZGxlIE5TVVJMQXV0aGVudGljYXRpb25N ZXRob2ROZWdvdGlhdGUgaW4gV2ViQ29yZTo6bWFjKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCAxNzVm ZGFmYjA3OWYzNWExNjRmMzkyZDFhOTZhZDMxNDZiNzMyYWM0Li5mODgzMGYyZGU2ZDUwNWJlODI3 ZjQzZTRjMjhlYWMzZTE2M2FjNDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAK KzIwMTMtMDctMDkgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgorCisgICAg ICAgIFtFRkxdIEFkZCBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0aW9fc2V0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg1MjEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBld2Via2l0IGFuZCBld2Via2l0 MiBoYXZlIGRpZmZlcmVudCBhcHByb2FjaCBhYm91dCBnZXR0aW5nIGRldmljZSBwaXhlbCByYXRp by4KKyAgICAgICAgZXdlYmtpdCBkZXBlbmRzIG9uIGRlcHJlY2F0ZWRUYXJnZXREUEkgYW5kIGVj b3JlX3hfZHBpX2dldCwKKyAgICAgICAgYnV0IGV3ZWJraXQyIHVzZSBQYWdlOjpkZXZpY2VTY2Fs ZUZhY3Rvci4KKworICAgICAgICBUaGlzIHBhdGNoIHdpbGwgYWRkIGV3a192aWV3X2RldmljZV9w aXhlbF9yYXRpb19zZXQgYW5kIHVzZSBQYWdlOjpkZXZpY2VTY2FsZUZhY3RvcigpCisgICAgICAg IGluc3RlYWQgb2YgVmlld3BvcnRBcmd1bWVudHM6OmRlcHJlY2F0ZWRUYXJnZXREUEkgbGlrZSBl d2Via2l0Mi4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChfZXdrX3Zp ZXdfcHJpdl9uZXcpOgorICAgICAgICAoX2V3a192aWV3X3ZpZXdwb3J0X2F0dHJpYnV0ZXNfY29t cHV0ZSk6IFVzZSBQYWdlOjpkZXZpY2VTY2FsZUZhY3RvcigpLgorICAgICAgICAoZXdrX3ZpZXdf dmlld3BvcnRfYXR0cmlidXRlc19nZXQpOiBEaXR0by4KKyAgICAgICAgKGV3a192aWV3X2Rldmlj ZV9waXhlbF9yYXRpb19zZXQpOiBBZGRlZC4KKyAgICAgICAgKGV3a192aWV3X2RldmljZV9waXhl bF9yYXRpb19nZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOgorICAgICAgICBVcGRhdGUg ZG9jdW1lbnQgb2YgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX2dldCAoZnJvbSBld2Via2l0 MikgYW5kCisgICAgICAgIGFkZGVkIGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19zZXQuCisK IDIwMTMtMDYtMjcgIEthbmdpbCBIYW4gIDxrYW5naWwuaGFuQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIEFkb3B0IGlzL3RvSFRNTElucHV0RWxlbWVudCBmb3IgY29kZSBjbGVhbnVwCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNwcAppbmRleCA5N2VlOWY3YzE4NTFiOWYwNTI1 ZDgwNDYzMGNkNTVmOGU2MzQxYzFmLi45MThiYjljZTUzNDg4YWY5NWQwM2FmODQ5MjBiNzE2ZTBi NDQ3YWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKQEAgLTQy LDcgKzQyLDcgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci0jaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkgfHwgUExBVEZPUk0oRUZMKSB8fCBQTEFURk9STShH VEspIHx8IFBMQVRGT1JNKFFUKQorI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkpIHx8IFBMQVRGT1JN KEdUSykgfHwgUExBVEZPUk0oUVQpCiBjb25zdCBmbG9hdCBWaWV3cG9ydEFyZ3VtZW50czo6ZGVw cmVjYXRlZFRhcmdldERQSSA9IDE2MDsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9y dEFyZ3VtZW50cy5oCmluZGV4IDVhYTMzMmIwYWJhZmY4MTU1YjlmMjhiNjM1ZDc4MDllNmIwYTY2 M2EuLjY1ZjNkNTc4NWZjNzlmNjU2NzZjYTY4ZDMyYjhkNDNlOGI4YjBhODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCkBAIC0xMjgsNyArMTI4LDcgQEAgc3RydWN0IFZp ZXdwb3J0QXJndW1lbnRzIHsKICAgICAgICAgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIpOwogICAg IH0KIAotI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkpIHx8IFBMQVRGT1JNKEVGTCkgfHwgUExBVEZP Uk0oR1RLKSB8fCBQTEFURk9STShRVCkKKyNpZiBQTEFURk9STShCTEFDS0JFUlJZKSB8fCBQTEFU Rk9STShHVEspIHx8IFBMQVRGT1JNKFFUKQogICAgIC8vIEZJWE1FOiBXZSdyZSBnb2luZyB0byBr ZWVwIHRoaXMgY29uc3RhbnQgYXJvdW5kIHVudGlsIGFsbCBlbWJlZGRlcnMKICAgICAvLyByZWZh Y3RvciB0aGVpciBjb2RlIHRvIG5vIGxvbmdlciBuZWVkIGl0LgogICAgIHN0YXRpYyBjb25zdCBm bG9hdCBkZXByZWNhdGVkVGFyZ2V0RFBJOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZWZsL0VmbFNjcmVlblV0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9lZmwvRWZsU2NyZWVuVXRpbGl0aWVzLmNwcAppbmRleCA3NjNlNjA5OWIzODYzMmYyMmZkN2Iw MDk3MDI4NWQ2ZjFjYjNjZjNlLi4xMzNhMWFjZmQ0ZWQwODlmNzMwZDE5MDdiYjIyYThiYzRlNjM0 NGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRWZsU2NyZWVuVXRp bGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRWZsU2NyZWVuVXRp bGl0aWVzLmNwcApAQCAtMTI2LDE1ICsxMjYsNiBAQCB2b2lkIGFwcGx5RmFsbGJhY2tDdXJzb3Io RWNvcmVfRXZhcyogZWNvcmVFdmFzLCBjb25zdCBjaGFyKiBjdXJzb3JTdHJpbmcpCiAjZW5kaWYK IH0KIAotaW50IGdldERQSSgpCi17Ci0jaWZkZWYgSEFWRV9FQ09SRV9YCi0gICAgcmV0dXJuIGVj b3JlX3hfZHBpX2dldCgpOwotI2Vsc2UKLSAgICByZXR1cm4gMTYwOwotI2VuZGlmCi19Ci0KIGJv b2wgaXNVc2luZ0Vjb3JlWChjb25zdCBFdmFzKiBldmFzKQogewogI2lmZGVmIEhBVkVfRUNPUkVf WApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0VmbFNjcmVlblV0aWxp dGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0VmbFNjcmVlblV0aWxpdGllcy5o CmluZGV4IGU5MTMwNTc4ZmE3NWMyMDdhOTkzZmEzMDBjYzI1NGI2Y2Y1MWU1MWYuLjY3ZmIwZjAz YzZiOThlYzY1YzVkYTU0ODMyMzUyOTUwOWU0OTQyNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2VmbC9FZmxTY3JlZW5VdGlsaXRpZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9lZmwvRWZsU2NyZWVuVXRpbGl0aWVzLmgKQEAgLTMwLDcgKzMwLDYgQEAgdHlw ZWRlZiBzdHJ1Y3QgX0V2YXMgRXZhczsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBhcHBs eUZhbGxiYWNrQ3Vyc29yKEVjb3JlX0V2YXMqLCBjb25zdCBjaGFyKik7Ci1pbnQgZ2V0RFBJKCk7 CiBib29sIGlzVXNpbmdFY29yZVgoY29uc3QgRXZhcyopOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCBjOWE5NTYxODA0Nzg2NzQ0M2Q0 M2NlY2ZiZjNlZWE1NGRhY2NlZDI5Li42ZGNiNjk0YmJiMGFiMGU3OWRjNTRkN2RkMzQwMjQ0Mzcx MmEwZWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTEyNSw4ICsxMjUsNiBA QAogc3RhdGljIGNvbnN0IGZsb2F0IHpvb21NaW5pbXVtID0gMC4wNTsKIHN0YXRpYyBjb25zdCBm bG9hdCB6b29tTWF4aW11bSA9IDQuMDsKIAotc3RhdGljIGNvbnN0IGZsb2F0IGRldmljZVBpeGVs UmF0aW8gPSAxLjA7Ci0KIHN0YXRpYyBjb25zdCBjaGFyIGV3a1ZpZXdUeXBlU3RyaW5nW10gPSAi RVdLX1ZpZXciOwogCiBzdGF0aWMgY29uc3Qgc2l6ZV90IGV3a1ZpZXdSZXBhaW50c1NpemVJbml0 aWFsID0gMzI7CkBAIC0zNDIsNyArMzQwLDYgQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0Rh dGEgewogICAgICAgICAgICAgZmxvYXQgbWF4U2NhbGU7CiAgICAgICAgICAgICBFaW5hX0Jvb2wg dXNlclNjYWxhYmxlIDogMTsKICAgICAgICAgfSB6b29tUmFuZ2U7Ci0gICAgICAgIGZsb2F0IGRl dmljZVBpeGVsUmF0aW87CiAgICAgICAgIGRvdWJsZSBkb21UaW1lckludGVydmFsOwogICAgICAg ICBib29sIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzIDogMTsKICAgICAgICAgYm9v bCBhbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgOiAxOwpAQCAtODQyLDcgKzgzOSw2IEBAIHN0 YXRpYyBFd2tfVmlld19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld19wcml2X25ldyhFd2tfVmlld19T bWFydF9EYXRhKiBzbWFydERhdGEpCiAgICAgcHJpdi0+c2V0dGluZ3Muem9vbVJhbmdlLm1pblNj YWxlID0gem9vbU1pbmltdW07CiAgICAgcHJpdi0+c2V0dGluZ3Muem9vbVJhbmdlLm1heFNjYWxl ID0gem9vbU1heGltdW07CiAgICAgcHJpdi0+c2V0dGluZ3Muem9vbVJhbmdlLnVzZXJTY2FsYWJs ZSA9IHRydWU7Ci0gICAgcHJpdi0+c2V0dGluZ3MuZGV2aWNlUGl4ZWxSYXRpbyA9IGRldmljZVBp eGVsUmF0aW87CiAKICAgICBwcml2LT5zZXR0aW5ncy5kb21UaW1lckludGVydmFsID0gcHJpdi0+ cGFnZVNldHRpbmdzLT5kZWZhdWx0TWluRE9NVGltZXJJbnRlcnZhbCgpOwogCkBAIC0xMjM5LDE0 ICsxMjM1LDExIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld196b29tX2FuaW1hdGlvbl9zdGFydChF d2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEpCiBzdGF0aWMgV2ViQ29yZTo6Vmlld3BvcnRB dHRyaWJ1dGVzIF9ld2tfdmlld192aWV3cG9ydF9hdHRyaWJ1dGVzX2NvbXB1dGUoRXdrX1ZpZXdf UHJpdmF0ZV9EYXRhKiBwcml2KQogewogICAgIGludCBkZXNrdG9wV2lkdGggPSA5ODA7Ci0gICAg aW50IGRldmljZURQSSA9IFdlYkNvcmU6OmdldERQSSgpOwotICAgIHByaXYtPnNldHRpbmdzLmRl dmljZVBpeGVsUmF0aW8gPSBkZXZpY2VEUEkgLyBXZWJDb3JlOjpWaWV3cG9ydEFyZ3VtZW50czo6 ZGVwcmVjYXRlZFRhcmdldERQSTsKLQogICAgIFdlYkNvcmU6OkludFJlY3QgYXZhaWxhYmxlUmVj dCA9IGVuY2xvc2luZ0ludFJlY3QocHJpdi0+cGFnZS0+Y2hyb21lKCkuY2xpZW50KCktPnBhZ2VS ZWN0KCkpOwogICAgIFdlYkNvcmU6OkludFJlY3QgZGV2aWNlUmVjdCA9IGVuY2xvc2luZ0ludFJl Y3QocHJpdi0+cGFnZS0+Y2hyb21lKCkuY2xpZW50KCktPndpbmRvd1JlY3QoKSk7CiAKLSAgICBX ZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMgYXR0cmlidXRlcyA9IFdlYkNvcmU6OmNvbXB1dGVW aWV3cG9ydEF0dHJpYnV0ZXMocHJpdi0+dmlld3BvcnRBcmd1bWVudHMsIGRlc2t0b3BXaWR0aCwg ZGV2aWNlUmVjdC53aWR0aCgpLCBkZXZpY2VSZWN0LmhlaWdodCgpLCBwcml2LT5zZXR0aW5ncy5k ZXZpY2VQaXhlbFJhdGlvLCBhdmFpbGFibGVSZWN0LnNpemUoKSk7Ci0gICAgV2ViQ29yZTo6cmVz dHJpY3RNaW5pbXVtU2NhbGVGYWN0b3JUb1ZpZXdwb3J0U2l6ZShhdHRyaWJ1dGVzLCBhdmFpbGFi bGVSZWN0LnNpemUoKSwgcHJpdi0+c2V0dGluZ3MuZGV2aWNlUGl4ZWxSYXRpbyk7CisgICAgV2Vi Q29yZTo6Vmlld3BvcnRBdHRyaWJ1dGVzIGF0dHJpYnV0ZXMgPSBXZWJDb3JlOjpjb21wdXRlVmll d3BvcnRBdHRyaWJ1dGVzKHByaXYtPnZpZXdwb3J0QXJndW1lbnRzLCBkZXNrdG9wV2lkdGgsIGRl dmljZVJlY3Qud2lkdGgoKSwgZGV2aWNlUmVjdC5oZWlnaHQoKSwgcHJpdi0+cGFnZS0+ZGV2aWNl U2NhbGVGYWN0b3IoKSwgYXZhaWxhYmxlUmVjdC5zaXplKCkpOworICAgIFdlYkNvcmU6OnJlc3Ry aWN0TWluaW11bVNjYWxlRmFjdG9yVG9WaWV3cG9ydFNpemUoYXR0cmlidXRlcywgYXZhaWxhYmxl UmVjdC5zaXplKCksIHByaXYtPnBhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgIFdlYkNv cmU6OnJlc3RyaWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKGF0 dHJpYnV0ZXMpOwogCiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CkBAIC0zOTQwLDcgKzM5MzMsNyBA QCB2b2lkIGV3a192aWV3X3ZpZXdwb3J0X2F0dHJpYnV0ZXNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0 KiBld2tWaWV3LCBpbnQqIHdpZHRoLCBpbgogICAgIGlmIChtaW5TY2FsZSkKICAgICAgICAgKm1p blNjYWxlID0gYXR0cmlidXRlcy5taW5pbXVtU2NhbGU7CiAgICAgaWYgKGRldmljZVBpeGVsUmF0 aW8pCi0gICAgICAgICpkZXZpY2VQaXhlbFJhdGlvID0gcHJpdi0+c2V0dGluZ3MuZGV2aWNlUGl4 ZWxSYXRpbzsKKyAgICAgICAgKmRldmljZVBpeGVsUmF0aW8gPSBwcml2LT5wYWdlLT5kZXZpY2VT Y2FsZUZhY3RvcigpOwogICAgIGlmICh1c2VyU2NhbGFibGUpCiAgICAgICAgICp1c2VyU2NhbGFi bGUgPSBzdGF0aWNfY2FzdDxib29sPihhdHRyaWJ1dGVzLnVzZXJTY2FsYWJsZSk7CiB9CkBAIC0z OTk1LDEyICszOTg4LDIyIEBAIEVpbmFfQm9vbCBld2tfdmlld191c2VyX3NjYWxhYmxlX2dldChj b25zdCBFdmFzX09iamVjdCogZXdrVmlldykKICAgICByZXR1cm4gcHJpdi0+c2V0dGluZ3Muem9v bVJhbmdlLnVzZXJTY2FsYWJsZTsKIH0KIAorRWluYV9Cb29sIGV3a192aWV3X2RldmljZV9waXhl bF9yYXRpb19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHJhdGlvKQoreworICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CisgICAg RVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOworCisg ICAgcHJpdi0+cGFnZS0+c2V0RGV2aWNlU2NhbGVGYWN0b3IocmF0aW8pOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKIGZsb2F0IGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19nZXQoY29uc3Qg RXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihl d2tWaWV3LCBzbWFydERhdGEsIC0xLjApOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVS TihzbWFydERhdGEsIHByaXYsIC0xLjApOwogCi0gICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmRl dmljZVBpeGVsUmF0aW87CisgICAgcmV0dXJuIHByaXYtPnBhZ2UtPmRldmljZVNjYWxlRmFjdG9y KCk7CiB9CiAKIHZvaWQgZXdrX3ZpZXdfdGV4dF9kaXJlY3Rpb25fc2V0KEV2YXNfT2JqZWN0KiBl d2tWaWV3LCBFd2tfVGV4dF9EaXJlY3Rpb24gZGlyZWN0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuaAppbmRleCAzYzY1ZWMxOTI4MmE3ODBhNTQyNDIyM2YyNTY4YzAwYzg1NDliODMyLi5lYjNj NzRlYWY4NDI5NjZlZmRhMGJkNzc3OGNjZGQ5ZTkzMGQyZGI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaApAQCAtMjQyMiwxNSArMjQyMiw1NSBAQCBFQVBJIEVpbmFfQm9vbCBld2tfdmlld191 c2VyX3NjYWxhYmxlX3NldChFdmFzX09iamVjdCAqbywgRWluYV9Cb29sIHVzZXJfc2NhbGFibAog RUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfdXNlcl9zY2FsYWJsZV9nZXQoY29uc3QgRXZhc19PYmpl Y3QgKm8pOwogCiAvKioKLSAqIEdldHMgdGhlIGRldmljZSBwaXhlbCByYXRpbyB2YWx1ZS4KKyAq IFF1ZXJpZXMgdGhlIHJhdGlvIGJldHdlZW4gdGhlIENTUyB1bml0cyBhbmQgZGV2aWNlIHBpeGVs cyB3aGVuIHRoZSBjb250ZW50IGlzIHVuc2NhbGVkLgogICoKLSAqIEBwYXJhbSBvIHZpZXcgdG8g Z2V0IHRoZSBkZXZpY2UgcGl4ZWwgcmF0aW8gdmFsdWUKKyAqIFdoZW4gZGVzaWduaW5nIHRvdWNo LWZyaWVuZGx5IGNvbnRlbnRzLCBrbm93aW5nIHRoZSBhcHByb3hpbWF0ZWQgdGFyZ2V0IHNpemUg b24gYSBkZXZpY2UKKyAqIGlzIGltcG9ydGFudCBmb3IgY29udGVudHMgcHJvdmlkZXJzIGluIG9y ZGVyIHRvIGdldCB0aGUgaW50ZW50ZWQgbGF5b3V0IGFuZCBlbGVtZW50CisgKiBzaXplcy4KICAq Ci0gKiBAcmV0dXJuIHRoZSBkZXZpY2UgcGl4ZWwgcmF0aW8gdmFsdWUgb24gc3VjY2VzcyBvciBA YyAtMS4wIG9uIGZhaWx1cmUKKyAqIEFzIG1vc3QgZmlyc3QgZ2VuZXJhdGlvbiB0b3VjaCBkZXZp Y2VzIGhhZCBhIFBQSSBvZiBhcHByb3hpbWF0ZWx5IDE2MCwgdGhpcyBiZWNhbWUgYQorICogZGUt ZmFjdG8gdmFsdWUsIHdoZW4gdXNlZCBpbiBjb25qdW5jdGlvbiB3aXRoIHRoZSB2aWV3cG9ydCBt ZXRhIHRhZy4KKyAqCisgKiBEZXZpY2VzIHdpdGggYSBoaWdoZXIgUFBJIGxlYXJuaW5nIHRvd2Fy ZHMgMjQwIG9yIDMyMCwgYXBwbGllcyBhIHByZS1zY2FsaW5nIG9uIGFsbAorICogY29udGVudCwg b2YgZWl0aGVyIDEuNSBvciAyLjAsIG5vdCBhZmZlY3RpbmcgdGhlIENTUyBzY2FsZSBvciBwaW5j aCB6b29taW5nLgorICoKKyAqIFRoaXMgdmFsdWUgY2FuIGJlIHNldCB1c2luZyB0aGlzIHByb3Bl cnR5IGFuZCBpdCBpcyBleHBvc2VkIHRvIENTUyBtZWRpYSBxdWVyaWVzIHVzaW5nCisgKiB0aGUg LXdlYmtpdC1kZXZpY2UtcGl4ZWwtcmF0aW8gcXVlcnkuCisgKgorICogRm9yIGluc3RhbmNlLCBp ZiB5b3Ugd2FudCB0byBsb2FkIGFuIGltYWdlIHdpdGhvdXQgaGF2aW5nIGl0IHVwc2NhbGVkIG9u IGEgd2ViIHZpZXcKKyAqIHVzaW5nIGEgZGV2aWNlIHBpeGVsIHJhdGlvIG9mIDIuMCBpdCBjYW4g YmUgZG9uZSBieSBsb2FkaW5nIGFuIGltYWdlIG9mIHNheSAxMDB4MTAwCisgKiBwaXhlbHMgYnV0 IHNob3dpbmcgaXQgYXQgaGFsZiB0aGUgc2l6ZS4KKyAqCisgKiBAbWVkaWEgKC13ZWJraXQtbWlu LWRldmljZS1waXhlbC1yYXRpbzogMS41KSB7CisgKiAgICAgLmljb24geworICogICAgICAgICB3 aWR0aDogNTBweDsKKyAqICAgICAgICAgaGVpZ2h0OiA1MHB4OworICogICAgICAgICB1cmw6ICIv aW1hZ2VzL2ljb25AMngucG5nIjsgLy8gVGhpcyBpcyBhY3R1YWxseSBhIDEwMHgxMDAgaW1hZ2UK KyAqICAgICB9CisgKiB9CisgKgorICogSWYgdGhlIGFib3ZlIGlzIHVzZWQgb24gYSBkZXZpY2Ug d2l0aCBkZXZpY2UgcGl4ZWwgcmF0aW8gb2YgMS41LCBpdCB3aWxsIGJlIHNjYWxlZAorICogZG93 biBidXQgc3RpbGwgcHJvdmlkZSBhIGJldHRlciBsb29raW5nIGltYWdlLgorICoKKyAqIEBwYXJh bSBvIHZpZXcgb2JqZWN0IHRvIGdldCBkZXZpY2UgcGl4ZWwgcmF0aW8KKyAqCisgKiBAcmV0dXJu IHRoZSByYXRpbyBiZXR3ZWVuIHRoZSBDU1MgdW5pdHMgYW5kIGRldmljZSBwaXhlbHMsCisgKiAg ICAgICAgIG9yIEBjIC0xLjAgb24gZmFpbHVyZQogICovCiBFQVBJIGZsb2F0IGV3a192aWV3X2Rl dmljZV9waXhlbF9yYXRpb19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogCiAvKioKKyAqIFNl dHMgdGhlIHJhdGlvIGJldHdlZW4gdGhlIENTUyB1bml0cyBhbmQgZGV2aWNlIHBpeGVscyB3aGVu IHRoZSBjb250ZW50IGlzIHVuc2NhbGVkLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRv IHNldCBkZXZpY2UgcGl4ZWwgcmF0aW8KKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBpZiB0 aGUgZGV2aWNlIHBpeGVsIHJhdGlvIHdhcyBzZXQsIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisg KgorICogQHNlZSBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0aW9fZ2V0KCkKKyAqLworRUFQSSBF aW5hX0Jvb2wgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldChFdmFzX09iamVjdCAqbywg ZmxvYXQgcmF0aW8pOworCisvKioKICAqIENoYW5nZXMgdGhlIHRleHQgZGlyZWN0aW9uIG9mIHRo ZSBzZWxlY3RlZCBpbnB1dCBub2RlLgogICoKICAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIHNl dCB0ZXh0IGRpcmVjdGlvbi4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCA0YjVjMjRmYmNlZTQ0YjdkMDQxYzcwMTFmYTU0YjU5OTRlODVhNjBiLi41 ODIyYjU2ODAwMmFjZjlkYjQ3MjJhMTUyYjY3ZTU5NzUyNzUyODVkIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMt MDctMDkgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdIEFkZCBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0aW9fc2V0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg1MjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEVXZWJMYXVuY2hlci9tYWluLmM6IEFk ZGVkIG5ldyBvcHRpb24oLXIpIHRvIHRlc3QgZGV2aWNlIHBpeGVsIHJhdGlvLgorICAgICAgICAo d2luZG93Q3JlYXRlKToKKyAgICAgICAgKHBhcnNlVXNlckFyZ3VtZW50cyk6CisKIDIwMTMtMDct MDkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBEdW1w UmVuZGVyVHJlZSBzaG91bGQgc3RvcCBzZW5kaW5nIHVuc3VwcG9ydGVkIFVSTHMgdG8gTlNXb3Jr c3BhY2UKZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMgYi9Ub29scy9FV2Vi TGF1bmNoZXIvbWFpbi5jCmluZGV4IDVjODMzZTkwZWE0MTk0MzE3OWQ1NmVlMzE1N2EyNmE3Nzdh ZDgxZDAuLjc5ZWI4MWI3MDU4ZThmNjk3MzdjYTI5OWE0MDNhNmJlNzYzMjA5M2IgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21h aW4uYwpAQCAtMTE1LDYgKzExNSw4IEBAIHN0YXRpYyBjb25zdCBFY29yZV9HZXRvcHQgb3B0aW9u cyA9IHsKICAgICAgICAgICAgICBlY29yZV9nZXRvcHRfY2FsbGJhY2tfZWNvcmVfZXZhc19saXN0 X2VuZ2luZXMsIE5VTEwpLAogICAgICAgICBFQ09SRV9HRVRPUFRfQ0hPSUNFCiAgICAgICAgICAg ICAoJ2InLCAiYmFja2luZy1zdG9yZSIsICJjaG9vc2UgYmFja2luZyBzdG9yZSB0byB1c2UuIiwg YmFja2luZ1N0b3JlcyksCisgICAgICAgIEVDT1JFX0dFVE9QVF9TVE9SRV9ET1VCTEUKKyAgICAg ICAgICAgICgncicsICJkZXZpY2UtcGl4ZWwtcmF0aW8iLCAiUmF0aW8gYmV0d2VlbiB0aGUgQ1NT IHVuaXRzIGFuZCBkZXZpY2UgcGl4ZWxzLiIpLAogICAgICAgICBFQ09SRV9HRVRPUFRfU1RPUkVf REVGX0JPT0wKICAgICAgICAgICAgICgnYycsICJlbmNvZGluZy1kZXRlY3RvciIsICJlbmFibGUv ZGlzYWJsZSBlbmNvZGluZyBkZXRlY3RvciIsIDApLAogICAgICAgICBFQ09SRV9HRVRPUFRfU1RP UkVfREVGX0JPT0wKQEAgLTE0OCw2ICsxNTAsNyBAQCB0eXBlZGVmIHN0cnVjdCBfVXNlcl9Bcmd1 bWVudHMgewogICAgIGNoYXIgKmVuZ2luZTsKICAgICBFaW5hX0Jvb2wgcXVpdE9wdGlvbjsKICAg ICBjaGFyICpiYWNraW5nU3RvcmU7CisgICAgZG91YmxlIGRldmljZV9waXhlbF9yYXRpbzsKICAg ICBFaW5hX0Jvb2wgZW5hYmxlRW5jb2RpbmdEZXRlY3RvcjsKICAgICBFaW5hX0Jvb2wgZW5hYmxl VGlsZWRCYWNraW5nU3RvcmU7CiAgICAgRWluYV9Cb29sIGlzRmxhdHRlbmluZzsKQEAgLTg2Myw2 ICs4NjYsNyBAQCB3aW5kb3dDcmVhdGUoVXNlcl9Bcmd1bWVudHMgKnVzZXJBcmdzKQogICAgIGV3 a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldChhcHAtPmJyb3dz ZXIsIHVzZXJBcmdzLT5kYXRhYmFzZVBhdGgpOwogICAgIGV3a192aWV3X3NldHRpbmdfZW5hYmxl X2ZyYW1lX2ZsYXR0ZW5pbmdfc2V0KGFwcC0+YnJvd3NlciwgdXNlckFyZ3MtPmlzRmxhdHRlbmlu Zyk7CiAgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19kZXRlY3Rvcl9zZXQoYXBwLT5icm93 c2VyLCB1c2VyQXJncy0+ZW5hYmxlRW5jb2RpbmdEZXRlY3Rvcik7CisgICAgZXdrX3ZpZXdfZGV2 aWNlX3BpeGVsX3JhdGlvX3NldChhcHAtPmJyb3dzZXIsIHVzZXJBcmdzLT5kZXZpY2VfcGl4ZWxf cmF0aW8pOwogCiAgICAgYXBwLT51c2VyQXJncyA9IHVzZXJBcmdzOwogICAgIGFwcC0+dXJsX2Jh ciA9IE5VTEw7CkBAIC05MzgsNiArOTQyLDcgQEAgcGFyc2VVc2VyQXJndW1lbnRzKGludCBhcmdj LCBjaGFyICphcmd2W10sIFVzZXJfQXJndW1lbnRzICp1c2VyQXJncykKICAgICB1c2VyQXJncy0+ ZW5naW5lID0gTlVMTDsKICAgICB1c2VyQXJncy0+cXVpdE9wdGlvbiA9IEVJTkFfRkFMU0U7CiAg ICAgdXNlckFyZ3MtPmJhY2tpbmdTdG9yZSA9IChjaGFyICopYmFja2luZ1N0b3Jlc1sxXTsKKyAg ICB1c2VyQXJncy0+ZGV2aWNlX3BpeGVsX3JhdGlvID0gMS4wOwogICAgIHVzZXJBcmdzLT5lbmFi bGVFbmNvZGluZ0RldGVjdG9yID0gRUlOQV9GQUxTRTsKICAgICB1c2VyQXJncy0+ZW5hYmxlVGls ZWRCYWNraW5nU3RvcmUgPSBFSU5BX0ZBTFNFOwogICAgIHVzZXJBcmdzLT5pc0ZsYXR0ZW5pbmcg PSBFSU5BX0ZBTFNFOwpAQCAtOTUzLDYgKzk1OCw3IEBAIHBhcnNlVXNlckFyZ3VtZW50cyhpbnQg YXJnYywgY2hhciAqYXJndltdLCBVc2VyX0FyZ3VtZW50cyAqdXNlckFyZ3MpCiAgICAgICAgIEVD T1JFX0dFVE9QVF9WQUxVRV9TVFIodXNlckFyZ3MtPmVuZ2luZSksCiAgICAgICAgIEVDT1JFX0dF VE9QVF9WQUxVRV9CT09MKHVzZXJBcmdzLT5xdWl0T3B0aW9uKSwKICAgICAgICAgRUNPUkVfR0VU T1BUX1ZBTFVFX1NUUih1c2VyQXJncy0+YmFja2luZ1N0b3JlKSwKKyAgICAgICAgRUNPUkVfR0VU T1BUX1ZBTFVFX0RPVUJMRSh1c2VyQXJncy0+ZGV2aWNlX3BpeGVsX3JhdGlvKSwKICAgICAgICAg RUNPUkVfR0VUT1BUX1ZBTFVFX0JPT0wodXNlckFyZ3MtPmVuYWJsZUVuY29kaW5nRGV0ZWN0b3Ip LAogICAgICAgICBFQ09SRV9HRVRPUFRfVkFMVUVfQk9PTCh1c2VyQXJncy0+aXNGbGF0dGVuaW5n KSwKICAgICAgICAgRUNPUkVfR0VUT1BUX1ZBTFVFX0JPT0wodXNlckFyZ3MtPmlzRnVsbHNjcmVl biksCg==