89140 2012-06-14 17:11:53 -0700 [EFL][WK2] Add ewk_view_cursor_set to change cursor. 2012-07-25 02:16:40 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 90107 61838 1 ryuan.choi ryuan.choi gyuyoung.kim gyuyoung.kim lucas.de.marchi webkit.review.bot oldest_to_newest 649652 0 ryuan.choi 2012-06-14 17:11:53 -0700 WebKit2/Efl can receive setCursor from WebProcess after r120369, but implementation is missing. 649656 1 147684 ryuan.choi 2012-06-14 17:20:11 -0700 Created attachment 147684 Patch 656489 2 147684 cdumez 2012-06-25 04:47:38 -0700 Comment on attachment 147684 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147684&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:553 > + WebCore::applyFallbackCursor(ecoreEvas, group); I'm not familiar with this code but why do we have only a fallback implementation here? It looks odd. If I look at the WK1 implementation, we have a normal implementation AND a fallback. 658947 3 ryuan.choi 2012-06-27 16:16:29 -0700 (In reply to comment #2) > (From update of attachment 147684 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=147684&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:553 > > + WebCore::applyFallbackCursor(ecoreEvas, group); > > I'm not familiar with this code but why do we have only a fallback implementation here? It looks odd. If I look at the WK1 implementation, we have a normal implementation AND a fallback. OK, if then I will revise this after Bug 900107 is landed because implementation of WebKit1/Efl needs theme. 671088 4 152718 ryuan.choi 2012-07-17 01:42:23 -0700 Created attachment 152718 Patch 672019 5 152718 cdumez 2012-07-17 23:24:54 -0700 Comment on attachment 152718 Patch LGTM. 672031 6 152718 gyuyoung.kim 2012-07-17 23:39:46 -0700 Comment on attachment 152718 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152718&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:818 > + width = 16; I think it is better to use constant variable for width and height. 672116 7 152961 ryuan.choi 2012-07-18 01:22:11 -0700 Created attachment 152961 Patch 672122 8 ryuan.choi 2012-07-18 01:25:39 -0700 (In reply to comment #6) > (From update of attachment 152718 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152718&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:818 > > + width = 16; > > I think it is better to use constant variable for width and height. Ok, I add defaultCursorSize for it. 672323 9 152961 gyuyoung.kim 2012-07-18 06:41:24 -0700 Comment on attachment 152961 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152961&action=review Looks good > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:334 > + g_parentSmartClass.add(ewkView); I wonder why do you move this line ? Do we need to add a view to parent smart class though view object can't get _Ewk_View_Private_Data ? > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:336 > + smartData->priv = _ewk_view_priv_new(smartData); Should we move this line ? 672359 10 ryuan.choi 2012-07-18 07:31:46 -0700 (In reply to comment #9) > (From update of attachment 152961 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152961&action=review > > Looks good > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:334 > > + g_parentSmartClass.add(ewkView); > > I wonder why do you move this line ? Do we need to add a view to parent smart class though view object can't get _Ewk_View_Private_Data ? Thank you. By calling `add` of parent smart class, child instance like ewkView initialize internal objects of smart data such as base.evas. > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:336 > > + smartData->priv = _ewk_view_priv_new(smartData); > > Should we move this line ? Yes. Before calling `add` of parent smart class, smartData is not concrete to use. so previous position is wrong. And because this patch need to use smartData in _ewk_view_priv_new, we should move it to right position. 672368 11 152961 gyuyoung.kim 2012-07-18 07:38:28 -0700 Comment on attachment 152961 Patch LGTM. 676175 12 153899 ryuan.choi 2012-07-23 16:49:52 -0700 Created attachment 153899 rebased 677817 13 153899 webkit.review.bot 2012-07-25 02:16:35 -0700 Comment on attachment 153899 rebased Clearing flags on attachment: 153899 Committed r123593: <http://trac.webkit.org/changeset/123593> 677818 14 webkit.review.bot 2012-07-25 02:16:40 -0700 All reviewed patches have been landed. Closing bug. 147684 2012-06-14 17:20:11 -0700 2012-06-27 16:16:43 -0700 Patch bug-89140-20120615092010.patch text/plain 5203 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDcxMWJhNTIyMzYxNDVj Y2UzZTNhMTk4NjZjZjRiYjU5OWE0YTk5Mi4uZDA2YjUzNmUxMzcwYjI5NWRkMTgxZjg1MWE5ZDFm YmQwMWNmYTBlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA2LTE0ICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBld2tfdmlld19jdXJzb3Jfc2V0IHRvIGNoYW5nZSBjdXJzb3IuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTE0MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBld2tfdmlld19jdXJzb3Jf c2V0IHRvIHN1cHBvcnQgY3Vyc29yIGNoYW5nZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBs OjpzZXRDdXJzb3IpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoK KyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3By aXZfbmV3KTogQ2hlY2sgd2hldGhlciBlY29yZV94IGNhbiBiZSB1c2VkLgorICAgICAgICAoX2V3 a192aWV3X3NtYXJ0X2FkZCk6CisgICAgICAgIENoYW5nZSBvcmRlciBvZiBpbml0aWFsaXphdGlv biB0byB1c2UgYmFzZSBzdHJ1Y3R1cmUgaW4gX2V3a192aWV3X3ByaXZfbmV3LgorICAgICAgICAo ZXdrX3ZpZXdfY3Vyc29yX3NldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXdfcHJpdmF0ZS5oOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDYtMTQgIEppYSBQdSAg PGpwdUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFyayB0ZXh0IHdpdGggdGV4dCBhbHRlcm5hdGl2 ZSB3aXRoIGJsdWUgdW5kZXJsaW5lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwCmluZGV4IDU2NzU0OGY1ZGE1NzRmOTZmMGRiM2E4 ZGY1NGNkYjZiNGJkYTgzYzAuLjA5OGZjMTY2YzU5MjY1YTQ4ZDM2NmEwNGU0Njc4NTQwZGM2NDE0 NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGll bnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xp ZW50SW1wbC5jcHAKQEAgLTEyMSw5ICsxMjEsOSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjp0b29s VGlwQ2hhbmdlZChjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKQogICAgIG5vdEltcGxlbWVu dGVkKCk7CiB9CiAKLXZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1cnNvcihjb25zdCBDdXJzb3Im KQordm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYgY3Vyc29yKQog ewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgZXdrX3ZpZXdfY3Vyc29yX3NldChtX3ZpZXdX aWRnZXQsIGN1cnNvcik7CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1cnNvckhpZGRl blVudGlsTW91c2VNb3Zlcyhib29sKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGRlMmFhODljOWM4NTRkNzMxMTM3N2U2NDYxNGUzMzVkMWFi ODMxMjUuLmQ2MWRiNGY5YTBiOGJiYjBmNmIwMTMxYzQxYWIxZTVmOTA2ZmU5ZjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTMwLDYgKzMw LDkgQEAKICNpbmNsdWRlICJld2tfY29udGV4dC5oIgogI2luY2x1ZGUgImV3a19jb250ZXh0X3By aXZhdGUuaCIKICNpbmNsdWRlICJld2tfdmlld19wcml2YXRlLmgiCisjaW5jbHVkZSA8RWNvcmVf RXZhcy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvQ3Vyc29yLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9F ZmxTY3JlZW5VdGlsaXRpZXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIHVz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC0zOSw3ICs0MiwxMiBAQCBzdGF0aWMgY29uc3QgY2hh ciBFV0tfVklFV19UWVBFX1NUUltdID0gIkVXSzJfVmlldyI7CiAKIHN0cnVjdCBfRXdrX1ZpZXdf UHJpdmF0ZV9EYXRhIHsKICAgICBPd25QdHI8UGFnZUNsaWVudEltcGw+IHBhZ2VDbGllbnQ7Cisg ICAgY29uc3QgY2hhciogY3Vyc29yR3JvdXA7CiAgICAgY29uc3QgY2hhciogdXJpOworCisjaWZk ZWYgSEFWRV9FQ09SRV9YCisgICAgYm9vbCBpc1VzaW5nRWNvcmVYOworI2VuZGlmCiB9OwogCiAj ZGVmaW5lIEVXS19WSUVXX1RZUEVfQ0hFQ0soZXdrVmlldywgcmVzdWx0KSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXApAQCAtMjU3LDYgKzI2NSwxMCBAQCBzdGF0aWMgRXdrX1Zp ZXdfUHJpdmF0ZV9EYXRhKiBfZXdrX3ZpZXdfcHJpdl9uZXcoRXdrX1ZpZXdfU21hcnRfRGF0YSog c21hcnREYXRhKQogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKKyNpZmRlZiBIQVZFX0VDT1JF X1gKKyAgICBwcml2LT5pc1VzaW5nRWNvcmVYID0gV2ViQ29yZTo6aXNVc2luZ0Vjb3JlWChzbWFy dERhdGEtPmJhc2UuZXZhcyk7CisjZW5kaWYKKwogICAgIHJldHVybiBwcml2OwogfQogCkBAIC0y ODcsOSArMjk5LDExIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9hZGQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcpCiAgICAgfQogCiAgICAgc21hcnREYXRhLT5zZWxmID0gZXdrVmlldzsKLSAg ICBzbWFydERhdGEtPnByaXYgPSBfZXdrX3ZpZXdfcHJpdl9uZXcoc21hcnREYXRhKTsKICAgICBz bWFydERhdGEtPmFwaSA9IGFwaTsKIAorICAgIGdfcGFyZW50U21hcnRDbGFzcy5hZGQoZXdrVmll dyk7CisKKyAgICBzbWFydERhdGEtPnByaXYgPSBfZXdrX3ZpZXdfcHJpdl9uZXcoc21hcnREYXRh KTsKICAgICBpZiAoIXNtYXJ0RGF0YS0+cHJpdikgewogICAgICAgICBFSU5BX0xPR19DUklUKCJj b3VsZCBub3QgYWxsb2NhdGUgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSIpOwogICAgICAgICBldmFz X29iamVjdF9zbWFydF9kYXRhX3NldChld2tWaWV3LCAwKTsKQEAgLTI5Nyw4ICszMTEsNiBAQCBz dGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfYWRkKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAg ICAgICByZXR1cm47CiAgICAgfQogCi0gICAgZ19wYXJlbnRTbWFydENsYXNzLmFkZChld2tWaWV3 KTsKLQogICAgIC8vIENyZWF0ZSBldmFzX29iamVjdF9pbWFnZSB0byBkcmF3IHdlYiBjb250ZW50 cy4KICAgICBzbWFydERhdGEtPmltYWdlID0gZXZhc19vYmplY3RfaW1hZ2VfYWRkKHNtYXJ0RGF0 YS0+YmFzZS5ldmFzKTsKICAgICBldmFzX29iamVjdF9pbWFnZV9hbHBoYV9zZXQoc21hcnREYXRh LT5pbWFnZSwgZmFsc2UpOwpAQCAtNTIzLDYgKzUzNSwyNSBAQCBjb25zdCBjaGFyKiBld2tfdmll d191cmlfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIHJldHVybiBwcml2LT51 cmk7CiB9CiAKK3ZvaWQgZXdrX3ZpZXdfY3Vyc29yX3NldChFdmFzX09iamVjdCogZXdrVmlldywg Y29uc3QgQ3Vyc29yJiBjdXJzb3IpCit7CisjaWZkZWYgSEFWRV9FQ09SRV9YCisgICAgRVdLX1ZJ RVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEpOworICAgIEVXS19WSUVXX1BS SVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYpOworCisgICAgaWYgKCFwcml2LT5pc1Vz aW5nRWNvcmVYKQorICAgICAgICByZXR1cm47CisKKyAgICBjb25zdCBjaGFyKiBncm91cCA9IGN1 cnNvci5wbGF0Zm9ybUN1cnNvcigpOworICAgIGlmICghZ3JvdXAgfHwgZ3JvdXAgPT0gcHJpdi0+ Y3Vyc29yR3JvdXApCisgICAgICAgIHJldHVybjsKKyAgICBwcml2LT5jdXJzb3JHcm91cCA9IGdy b3VwOworCisgICAgRWNvcmVfRXZhcyogZWNvcmVFdmFzID0gZWNvcmVfZXZhc19lY29yZV9ldmFz X2dldChzbWFydERhdGEtPmJhc2UuZXZhcyk7CisgICAgV2ViQ29yZTo6YXBwbHlGYWxsYmFja0N1 cnNvcihlY29yZUV2YXMsIGdyb3VwKTsKKyNlbmRpZgorfQorCiB2b2lkIGV3a192aWV3X2Rpc3Bs YXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgRVdL X1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCmluZGV4IDE5 ZDBjODY4OTI2OTQ2NzA4YzY4ZTFjNTdmMWFkNWZhY2VhYzcwMjYuLjI1OGQ0NjhhZmUzYmY1ODlk N2Q3Y2VmY2FjZDE0YWY5OWIyOTY2ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgKQEAgLTI2LDEwICsyNiwxMiBAQAogI2lu Y2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEN1 cnNvcjsKIGNsYXNzIEludFJlY3Q7CiBjbGFzcyBJbnRTaXplOwogfQogCit2b2lkIGV3a192aWV3 X2N1cnNvcl9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IFdlYkNvcmU6OkN1cnNvciYg Y3Vyc29yKTsKIHZvaWQgZXdrX3ZpZXdfZGlzcGxheShFdmFzX09iamVjdCogZXdrVmlldywgY29u c3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCk7CiB2b2lkIGV3a192aWV3X2ltYWdlX2RhdGFfc2V0 KEV2YXNfT2JqZWN0KiBld2tWaWV3LCB2b2lkKiBpbWFnZURhdGEsIGNvbnN0IFdlYkNvcmU6Oklu dFNpemUmIHNpemUpOwogCg== 152718 2012-07-17 01:42:23 -0700 2012-07-18 01:22:03 -0700 Patch bug-89140-20120717174224.patch text/plain 7331 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWI2M2ZhNzA2OWM1ZDBl ZjlhOTBlMWQwZDRkNmEzM2ZiNjg3MDZjMS4uOTYxODA3NzFlNzk4ZTM3Y2FmMzM3Zjg2OWIxMjdm Yjk1ZTZhZTQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA3LTE3ICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBld2tfdmlld19jdXJzb3Jfc2V0IHRvIGNoYW5nZSBjdXJzb3IuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTE0MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBld2tfdmlld19jdXJzb3Jf c2V0IHRvIHN1cHBvcnQgY3Vyc29yIGNoYW5nZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBs OjpzZXRDdXJzb3IpOiBDYWxsZWQgZXdrX3ZpZXdfY3Vyc29yX3NldC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChfRXdrX1ZpZXdfUHJpdmF0ZV9E YXRhKToKKyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGE6Ol9Fd2tfVmlld19Qcml2YXRl X0RhdGEpOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YTo6fl9Fd2tfVmlld19Qcml2 YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KTogQ2hlY2sgd2hldGhlciBl Y29yZV94IGNhbiBiZSB1c2VkLgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X2FkZCk6CisgICAg ICAgIENoYW5nZSBvcmRlciBvZiBpbml0aWFsaXphdGlvbiB0byB1c2UgYmFzZSBzdHJ1Y3R1cmUg aW4gX2V3a192aWV3X3ByaXZfbmV3LgorICAgICAgICAoZXdrX3ZpZXdfY3Vyc29yX3NldCk6IEFk ZGVkIHRvIHNldCBjdXJzb3IuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdf cHJpdmF0ZS5oOgorCiAyMDEyLTA3LTE2ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ft c3VuZy5jb20+CiAKICAgICAgICAgQWRkIFJlZ2lzdGVyUHJvdG9jb2xIYW5kbGVyQ2xpZW50IHRv IHRoZSBNb2R1bGVzL3Byb3RvY29saGFuZGxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwCmluZGV4IGU2OWY4N2QyODAxMmRlMTUz MGM5MmM5Y2NiMjIxYmRjODIxYzRhZGYuLjExOGVkYjExZmYxMDE3ZTkyZGY3MDMzZmI1OThiOTA1 MTE3ODlhMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1Bh Z2VDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Q YWdlQ2xpZW50SW1wbC5jcHAKQEAgLTEyMSw5ICsxMjEsOSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBs Ojp0b29sVGlwQ2hhbmdlZChjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKQogICAgIG5vdElt cGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1cnNvcihjb25zdCBD dXJzb3ImKQordm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYgY3Vy c29yKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgZXdrX3ZpZXdfY3Vyc29yX3NldCht X3ZpZXdXaWRnZXQsIGN1cnNvcik7CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1cnNv ckhpZGRlblVudGlsTW91c2VNb3Zlcyhib29sKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDhiNzEzMmI0ODQ3YWE2NTEzYjUyYmEyYzBlMjll ZGY3NmJhMmUzNWQuLjI4MDk2MTJiZjVkMzdkZjRjNWQ0NGMyNzg4MTQ3YWE4NThhZjM4MzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTM2 LDYgKzM2LDEwIEBACiAjaW5jbHVkZSAiZXdrX3ZpZXdfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3 a192aWV3X3Jlc291cmNlX2xvYWRfY2xpZW50X3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tfd2Vi X3Jlc291cmNlLmgiCisjaW5jbHVkZSA8RWNvcmVfRXZhcy5oPgorI2luY2x1ZGUgPEVkamUuaD4K KyNpbmNsdWRlIDxXZWJDb3JlL0N1cnNvci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRWZsU2NyZWVu VXRpbGl0aWVzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiB1c2luZyBuYW1l c3BhY2UgV2ViS2l0OwpAQCAtNDcsMTUgKzUxLDI2IEBAIHR5cGVkZWYgSGFzaE1hcDx1aW50NjRf dCwgRXdrX1dlYl9SZXNvdXJjZSo+IExvYWRpbmdSZXNvdXJjZXNNYXA7CiAKIHN0cnVjdCBfRXdr X1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICBPd25QdHI8UGFnZUNsaWVudEltcGw+IHBhZ2VDbGll bnQ7CisgICAgY29uc3QgY2hhciogY3Vyc29yR3JvdXA7CiAgICAgY29uc3QgY2hhciogdXJpOwog ICAgIGNvbnN0IGNoYXIqIHRpdGxlOwogICAgIGNvbnN0IGNoYXIqIHRoZW1lOworICAgIEV2YXNf T2JqZWN0KiBjdXJzb3JPYmplY3Q7CiAgICAgTG9hZGluZ1Jlc291cmNlc01hcCBsb2FkaW5nUmVz b3VyY2VzTWFwOwogCisjaWZkZWYgSEFWRV9FQ09SRV9YCisgICAgYm9vbCBpc1VzaW5nRWNvcmVY OworI2VuZGlmCisKICAgICBfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKCkKLSAgICAgICAgOiB1cmko MCkKKyAgICAgICAgOiBjdXJzb3JHcm91cCgwKQorICAgICAgICAsIHVyaSgwKQogICAgICAgICAs IHRpdGxlKDApCiAgICAgICAgICwgdGhlbWUoMCkKKyAgICAgICAgLCBjdXJzb3JPYmplY3QoMCkK KyNpZmRlZiBIQVZFX0VDT1JFX1gKKyAgICAgICAgLCBpc1VzaW5nRWNvcmVYKGZhbHNlKQorI2Vu ZGlmCiAgICAgeyB9CiAKICAgICB+X0V3a19WaWV3X1ByaXZhdGVfRGF0YSgpCkBAIC02Myw2ICs3 OCw5IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAgZWluYV9zdHJp bmdzaGFyZV9kZWwodXJpKTsKICAgICAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwodGl0bGUpOwog ICAgICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbCh0aGVtZSk7CisKKyAgICAgICAgaWYgKGN1cnNv ck9iamVjdCkKKyAgICAgICAgICAgIGV2YXNfb2JqZWN0X2RlbChjdXJzb3JPYmplY3QpOwogICAg IH0KIH07CiAKQEAgLTI4MCw2ICsyOTgsMTAgQEAgc3RhdGljIEV3a19WaWV3X1ByaXZhdGVfRGF0 YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKICAg ICAgICAgcmV0dXJuIDA7CiAgICAgfQogCisjaWZkZWYgSEFWRV9FQ09SRV9YCisgICAgcHJpdi0+ aXNVc2luZ0Vjb3JlWCA9IFdlYkNvcmU6OmlzVXNpbmdFY29yZVgoc21hcnREYXRhLT5iYXNlLmV2 YXMpOworI2VuZGlmCisKICAgICByZXR1cm4gcHJpdjsKIH0KIApAQCAtMzA1LDkgKzMyNywxMSBA QCBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfYWRkKEV2YXNfT2JqZWN0KiBld2tWaWV3KQog ICAgIH0KIAogICAgIHNtYXJ0RGF0YS0+c2VsZiA9IGV3a1ZpZXc7Ci0gICAgc21hcnREYXRhLT5w cml2ID0gX2V3a192aWV3X3ByaXZfbmV3KHNtYXJ0RGF0YSk7CiAgICAgc21hcnREYXRhLT5hcGkg PSBhcGk7CiAKKyAgICBnX3BhcmVudFNtYXJ0Q2xhc3MuYWRkKGV3a1ZpZXcpOworCisgICAgc21h cnREYXRhLT5wcml2ID0gX2V3a192aWV3X3ByaXZfbmV3KHNtYXJ0RGF0YSk7CiAgICAgaWYgKCFz bWFydERhdGEtPnByaXYpIHsKICAgICAgICAgRUlOQV9MT0dfQ1JJVCgiY291bGQgbm90IGFsbG9j YXRlIF9Fd2tfVmlld19Qcml2YXRlX0RhdGEiKTsKICAgICAgICAgZXZhc19vYmplY3Rfc21hcnRf ZGF0YV9zZXQoZXdrVmlldywgMCk7CkBAIC0zMTUsOCArMzM5LDYgQEAgc3RhdGljIHZvaWQgX2V3 a192aWV3X3NtYXJ0X2FkZChFdmFzX09iamVjdCogZXdrVmlldykKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIGdfcGFyZW50U21hcnRDbGFzcy5hZGQoZXdrVmlldyk7Ci0KICAgICAvLyBD cmVhdGUgZXZhc19vYmplY3RfaW1hZ2UgdG8gZHJhdyB3ZWIgY29udGVudHMuCiAgICAgc21hcnRE YXRhLT5pbWFnZSA9IGV2YXNfb2JqZWN0X2ltYWdlX2FkZChzbWFydERhdGEtPmJhc2UuZXZhcyk7 CiAgICAgZXZhc19vYmplY3RfaW1hZ2VfYWxwaGFfc2V0KHNtYXJ0RGF0YS0+aW1hZ2UsIGZhbHNl KTsKQEAgLTc2MSw2ICs3ODMsNTcgQEAgY29uc3QgY2hhciogZXdrX3ZpZXdfdGhlbWVfZ2V0KGNv bnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIHJldHVybiBwcml2LT50aGVtZTsKIH0KIAor dm9pZCBld2tfdmlld19jdXJzb3Jfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBDdXJz b3ImIGN1cnNvcikKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNt YXJ0RGF0YSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJp dik7CisKKyAgICBjb25zdCBjaGFyKiBncm91cCA9IGN1cnNvci5wbGF0Zm9ybUN1cnNvcigpOwor ICAgIGlmICghZ3JvdXAgfHwgZ3JvdXAgPT0gcHJpdi0+Y3Vyc29yR3JvdXApCisgICAgICAgIHJl dHVybjsKKyAgICBwcml2LT5jdXJzb3JHcm91cCA9IGdyb3VwOworCisgICAgaWYgKHByaXYtPmN1 cnNvck9iamVjdCkKKyAgICAgICAgZXZhc19vYmplY3RfZGVsKHByaXYtPmN1cnNvck9iamVjdCk7 CisgICAgcHJpdi0+Y3Vyc29yT2JqZWN0ID0gZWRqZV9vYmplY3RfYWRkKHNtYXJ0RGF0YS0+YmFz ZS5ldmFzKTsKKworICAgIEVjb3JlX0V2YXMqIGVjb3JlRXZhcyA9IGVjb3JlX2V2YXNfZWNvcmVf ZXZhc19nZXQoc21hcnREYXRhLT5iYXNlLmV2YXMpOworICAgIGlmICghcHJpdi0+dGhlbWUgfHwg IWVkamVfb2JqZWN0X2ZpbGVfc2V0KHByaXYtPmN1cnNvck9iamVjdCwgcHJpdi0+dGhlbWUsIGdy b3VwKSkgeworICAgICAgICBldmFzX29iamVjdF9kZWwocHJpdi0+Y3Vyc29yT2JqZWN0KTsKKyAg ICAgICAgcHJpdi0+Y3Vyc29yT2JqZWN0ID0gMDsKKworICAgICAgICBlY29yZV9ldmFzX29iamVj dF9jdXJzb3Jfc2V0KGVjb3JlRXZhcywgMCwgMCwgMCwgMCk7CisjaWZkZWYgSEFWRV9FQ09SRV9Y CisgICAgICAgIGlmIChwcml2LT5pc1VzaW5nRWNvcmVYKQorICAgICAgICAgICAgV2ViQ29yZTo6 YXBwbHlGYWxsYmFja0N1cnNvcihlY29yZUV2YXMsIGdyb3VwKTsKKyNlbmRpZgorICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgRXZhc19Db29yZCB3aWR0aCwgaGVpZ2h0OworICAgIGVkamVf b2JqZWN0X3NpemVfbWluX2dldChwcml2LT5jdXJzb3JPYmplY3QsICZ3aWR0aCwgJmhlaWdodCk7 CisgICAgaWYgKHdpZHRoIDw9IDAgfHwgaGVpZ2h0IDw9IDApCisgICAgICAgIGVkamVfb2JqZWN0 X3NpemVfbWluX2NhbGMocHJpdi0+Y3Vyc29yT2JqZWN0LCAmd2lkdGgsICZoZWlnaHQpOworICAg IGlmICh3aWR0aCA8PSAwIHx8IGhlaWdodCA8PSAwKSB7CisgICAgICAgIHdpZHRoID0gMTY7Cisg ICAgICAgIGhlaWdodCA9IDE2OworICAgIH0KKyAgICBldmFzX29iamVjdF9yZXNpemUocHJpdi0+ Y3Vyc29yT2JqZWN0LCB3aWR0aCwgaGVpZ2h0KTsKKworICAgIGNvbnN0IGNoYXIqIGRhdGE7Cisg ICAgaW50IGhvdHNwb3RYID0gMDsKKyAgICBkYXRhID0gZWRqZV9vYmplY3RfZGF0YV9nZXQocHJp di0+Y3Vyc29yT2JqZWN0LCAiaG90LngiKTsKKyAgICBpZiAoZGF0YSkKKyAgICAgICAgaG90c3Bv dFggPSBhdG9pKGRhdGEpOworCisgICAgaW50IGhvdHNwb3RZID0gMDsKKyAgICBkYXRhID0gZWRq ZV9vYmplY3RfZGF0YV9nZXQocHJpdi0+Y3Vyc29yT2JqZWN0LCAiaG90LnkiKTsKKyAgICBpZiAo ZGF0YSkKKyAgICAgICAgaG90c3BvdFkgPSBhdG9pKGRhdGEpOworCisgICAgZWNvcmVfZXZhc19v YmplY3RfY3Vyc29yX3NldChlY29yZUV2YXMsIHByaXYtPmN1cnNvck9iamVjdCwgRVZBU19MQVlF Ul9NQVgsIGhvdHNwb3RYLCBob3RzcG90WSk7Cit9CisKIHZvaWQgZXdrX3ZpZXdfZGlzcGxheShF dmFzX09iamVjdCogZXdrVmlldywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgKaW5kZXggM2M5Y2U5 NGE3MTRlYjcxZTdmYjkzMGY0MzUwMjhiNTBhOWE1ZGVjYi4uYTBhNjc5MDA1YzkxMmViMWJkYjI0 NTc2YzkwYzc5OGFiMGE5NWI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUg PFdlYktpdDIvV0tCYXNlLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEN1cnNvcjsK IGNsYXNzIEludFJlY3Q7CiBjbGFzcyBJbnRTaXplOwogfQpAQCAtNDIsNiArNDMsNyBAQCB0eXBl ZGVmIHN0cnVjdCBfRXdrX0ludGVudCBFd2tfSW50ZW50OwogdHlwZWRlZiBzdHJ1Y3QgX0V3a19J bnRlbnRfU2VydmljZSBFd2tfSW50ZW50X1NlcnZpY2U7CiAjZW5kaWYKIAordm9pZCBld2tfdmll d19jdXJzb3Jfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBXZWJDb3JlOjpDdXJzb3Im IGN1cnNvcik7CiB2b2lkIGV3a192aWV3X2Rpc3BsYXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNv bnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpOwogdm9pZCBld2tfdmlld19pbWFnZV9kYXRhX3Nl dChFdmFzX09iamVjdCogZXdrVmlldywgdm9pZCogaW1hZ2VEYXRhLCBjb25zdCBXZWJDb3JlOjpJ bnRTaXplJiBzaXplKTsKIHZvaWQgZXdrX3ZpZXdfbG9hZF9lcnJvcihFdmFzX09iamVjdCogZXdr VmlldywgY29uc3QgRXdrX1dlYl9FcnJvciogZXJyb3IpOwo= 152961 2012-07-18 01:22:11 -0700 2012-07-23 16:49:44 -0700 Patch bug-89140-20120718172212.patch text/plain 7486 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDJhOWM0NDYxMzU4Y2M0 MzA2MDhhMzMyNTQ2NDdlOGFjMDUxOTQ2NC4uYjM2Njk2OTBjMDM2MDgyYmU1YWZiMDU4MjUwZmQx ODU3YjM3OGJmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA3LTE4ICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBld2tfdmlld19jdXJzb3Jfc2V0IHRvIGNoYW5nZSBjdXJzb3IuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTE0MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBld2tfdmlld19jdXJzb3Jf c2V0IHRvIHN1cHBvcnQgY3Vyc29yIGNoYW5nZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBs OjpzZXRDdXJzb3IpOiBDYWxsZWQgZXdrX3ZpZXdfY3Vyc29yX3NldC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChfRXdrX1ZpZXdfUHJpdmF0ZV9E YXRhKToKKyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGE6Ol9Fd2tfVmlld19Qcml2YXRl X0RhdGEpOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YTo6fl9Fd2tfVmlld19Qcml2 YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KTogQ2hlY2sgd2hldGhlciBl Y29yZV94IGNhbiBiZSB1c2VkLgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X2FkZCk6CisgICAg ICAgIENoYW5nZSBvcmRlciBvZiBpbml0aWFsaXphdGlvbiB0byB1c2UgYmFzZSBzdHJ1Y3R1cmUg aW4gX2V3a192aWV3X3ByaXZfbmV3LgorICAgICAgICAoZXdrX3ZpZXdfY3Vyc29yX3NldCk6IEFk ZGVkIHRvIHNldCBjdXJzb3IuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdf cHJpdmF0ZS5oOgorCiAyMDEyLTA3LTE3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5k dW1lekBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gUmVwbGFjZSAwIGJ5IE5VTEwgaW4gcHVi bGljIGhlYWRlcnMgZG9jdW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwCmluZGV4IGU2OWY4N2QyODAxMmRlMTUzMGM5 MmM5Y2NiMjIxYmRjODIxYzRhZGYuLjExOGVkYjExZmYxMDE3ZTkyZGY3MDMzZmI1OThiOTA1MTE3 ODlhMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VD bGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdl Q2xpZW50SW1wbC5jcHAKQEAgLTEyMSw5ICsxMjEsOSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjp0 b29sVGlwQ2hhbmdlZChjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKQogICAgIG5vdEltcGxl bWVudGVkKCk7CiB9CiAKLXZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1cnNvcihjb25zdCBDdXJz b3ImKQordm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYgY3Vyc29y KQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgZXdrX3ZpZXdfY3Vyc29yX3NldChtX3Zp ZXdXaWRnZXQsIGN1cnNvcik7CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1cnNvckhp ZGRlblVudGlsTW91c2VNb3Zlcyhib29sKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDhiNzEzMmI0ODQ3YWE2NTEzYjUyYmEyYzBlMjllZGY3 NmJhMmUzNWQuLjc3Y2IxOGU1NTljZDE2YTAyZDFjMzAyN2EwMGVjZGRkOTg2OTk3MjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTM2LDYg KzM2LDEwIEBACiAjaW5jbHVkZSAiZXdrX3ZpZXdfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a192 aWV3X3Jlc291cmNlX2xvYWRfY2xpZW50X3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tfd2ViX3Jl c291cmNlLmgiCisjaW5jbHVkZSA8RWNvcmVfRXZhcy5oPgorI2luY2x1ZGUgPEVkamUuaD4KKyNp bmNsdWRlIDxXZWJDb3JlL0N1cnNvci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRWZsU2NyZWVuVXRp bGl0aWVzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiB1c2luZyBuYW1lc3Bh Y2UgV2ViS2l0OwpAQCAtNDMsMTkgKzQ3LDMyIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog CiBzdGF0aWMgY29uc3QgY2hhciBFV0tfVklFV19UWVBFX1NUUltdID0gIkVXSzJfVmlldyI7CiAK K3N0YXRpYyBjb25zdCBpbnQgZGVmYXVsdEN1cnNvclNpemUgPSAxNjsKKwogdHlwZWRlZiBIYXNo TWFwPHVpbnQ2NF90LCBFd2tfV2ViX1Jlc291cmNlKj4gTG9hZGluZ1Jlc291cmNlc01hcDsKIAog c3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgIE93blB0cjxQYWdlQ2xpZW50SW1w bD4gcGFnZUNsaWVudDsKKyAgICBjb25zdCBjaGFyKiBjdXJzb3JHcm91cDsKICAgICBjb25zdCBj aGFyKiB1cmk7CiAgICAgY29uc3QgY2hhciogdGl0bGU7CiAgICAgY29uc3QgY2hhciogdGhlbWU7 CisgICAgRXZhc19PYmplY3QqIGN1cnNvck9iamVjdDsKICAgICBMb2FkaW5nUmVzb3VyY2VzTWFw IGxvYWRpbmdSZXNvdXJjZXNNYXA7CiAKKyNpZmRlZiBIQVZFX0VDT1JFX1gKKyAgICBib29sIGlz VXNpbmdFY29yZVg7CisjZW5kaWYKKwogICAgIF9Fd2tfVmlld19Qcml2YXRlX0RhdGEoKQotICAg ICAgICA6IHVyaSgwKQorICAgICAgICA6IGN1cnNvckdyb3VwKDApCisgICAgICAgICwgdXJpKDAp CiAgICAgICAgICwgdGl0bGUoMCkKICAgICAgICAgLCB0aGVtZSgwKQorICAgICAgICAsIGN1cnNv ck9iamVjdCgwKQorI2lmZGVmIEhBVkVfRUNPUkVfWAorICAgICAgICAsIGlzVXNpbmdFY29yZVgo ZmFsc2UpCisjZW5kaWYKICAgICB7IH0KIAogICAgIH5fRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKCkK QEAgLTYzLDYgKzgwLDkgQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgICAg ICBlaW5hX3N0cmluZ3NoYXJlX2RlbCh1cmkpOwogICAgICAgICBlaW5hX3N0cmluZ3NoYXJlX2Rl bCh0aXRsZSk7CiAgICAgICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHRoZW1lKTsKKworICAgICAg ICBpZiAoY3Vyc29yT2JqZWN0KQorICAgICAgICAgICAgZXZhc19vYmplY3RfZGVsKGN1cnNvck9i amVjdCk7CiAgICAgfQogfTsKIApAQCAtMjgwLDYgKzMwMCwxMCBAQCBzdGF0aWMgRXdrX1ZpZXdf UHJpdmF0ZV9EYXRhKiBfZXdrX3ZpZXdfcHJpdl9uZXcoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21h cnREYXRhKQogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKKyNpZmRlZiBIQVZFX0VDT1JFX1gK KyAgICBwcml2LT5pc1VzaW5nRWNvcmVYID0gV2ViQ29yZTo6aXNVc2luZ0Vjb3JlWChzbWFydERh dGEtPmJhc2UuZXZhcyk7CisjZW5kaWYKKwogICAgIHJldHVybiBwcml2OwogfQogCkBAIC0zMDUs OSArMzI5LDExIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9hZGQoRXZhc19PYmplY3Qq IGV3a1ZpZXcpCiAgICAgfQogCiAgICAgc21hcnREYXRhLT5zZWxmID0gZXdrVmlldzsKLSAgICBz bWFydERhdGEtPnByaXYgPSBfZXdrX3ZpZXdfcHJpdl9uZXcoc21hcnREYXRhKTsKICAgICBzbWFy dERhdGEtPmFwaSA9IGFwaTsKIAorICAgIGdfcGFyZW50U21hcnRDbGFzcy5hZGQoZXdrVmlldyk7 CisKKyAgICBzbWFydERhdGEtPnByaXYgPSBfZXdrX3ZpZXdfcHJpdl9uZXcoc21hcnREYXRhKTsK ICAgICBpZiAoIXNtYXJ0RGF0YS0+cHJpdikgewogICAgICAgICBFSU5BX0xPR19DUklUKCJjb3Vs ZCBub3QgYWxsb2NhdGUgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSIpOwogICAgICAgICBldmFzX29i amVjdF9zbWFydF9kYXRhX3NldChld2tWaWV3LCAwKTsKQEAgLTMxNSw4ICszNDEsNiBAQCBzdGF0 aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfYWRkKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgZ19wYXJlbnRTbWFydENsYXNzLmFkZChld2tWaWV3KTsK LQogICAgIC8vIENyZWF0ZSBldmFzX29iamVjdF9pbWFnZSB0byBkcmF3IHdlYiBjb250ZW50cy4K ICAgICBzbWFydERhdGEtPmltYWdlID0gZXZhc19vYmplY3RfaW1hZ2VfYWRkKHNtYXJ0RGF0YS0+ YmFzZS5ldmFzKTsKICAgICBldmFzX29iamVjdF9pbWFnZV9hbHBoYV9zZXQoc21hcnREYXRhLT5p bWFnZSwgZmFsc2UpOwpAQCAtNzYxLDYgKzc4NSw1NyBAQCBjb25zdCBjaGFyKiBld2tfdmlld190 aGVtZV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgcmV0dXJuIHByaXYtPnRo ZW1lOwogfQogCit2b2lkIGV3a192aWV3X2N1cnNvcl9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcs IGNvbnN0IEN1cnNvciYgY3Vyc29yKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4o ZXdrVmlldywgc21hcnREYXRhKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21h cnREYXRhLCBwcml2KTsKKworICAgIGNvbnN0IGNoYXIqIGdyb3VwID0gY3Vyc29yLnBsYXRmb3Jt Q3Vyc29yKCk7CisgICAgaWYgKCFncm91cCB8fCBncm91cCA9PSBwcml2LT5jdXJzb3JHcm91cCkK KyAgICAgICAgcmV0dXJuOworICAgIHByaXYtPmN1cnNvckdyb3VwID0gZ3JvdXA7CisKKyAgICBp ZiAocHJpdi0+Y3Vyc29yT2JqZWN0KQorICAgICAgICBldmFzX29iamVjdF9kZWwocHJpdi0+Y3Vy c29yT2JqZWN0KTsKKyAgICBwcml2LT5jdXJzb3JPYmplY3QgPSBlZGplX29iamVjdF9hZGQoc21h cnREYXRhLT5iYXNlLmV2YXMpOworCisgICAgRWNvcmVfRXZhcyogZWNvcmVFdmFzID0gZWNvcmVf ZXZhc19lY29yZV9ldmFzX2dldChzbWFydERhdGEtPmJhc2UuZXZhcyk7CisgICAgaWYgKCFwcml2 LT50aGVtZSB8fCAhZWRqZV9vYmplY3RfZmlsZV9zZXQocHJpdi0+Y3Vyc29yT2JqZWN0LCBwcml2 LT50aGVtZSwgZ3JvdXApKSB7CisgICAgICAgIGV2YXNfb2JqZWN0X2RlbChwcml2LT5jdXJzb3JP YmplY3QpOworICAgICAgICBwcml2LT5jdXJzb3JPYmplY3QgPSAwOworCisgICAgICAgIGVjb3Jl X2V2YXNfb2JqZWN0X2N1cnNvcl9zZXQoZWNvcmVFdmFzLCAwLCAwLCAwLCAwKTsKKyNpZmRlZiBI QVZFX0VDT1JFX1gKKyAgICAgICAgaWYgKHByaXYtPmlzVXNpbmdFY29yZVgpCisgICAgICAgICAg ICBXZWJDb3JlOjphcHBseUZhbGxiYWNrQ3Vyc29yKGVjb3JlRXZhcywgZ3JvdXApOworI2VuZGlm CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBFdmFzX0Nvb3JkIHdpZHRoLCBoZWlnaHQ7 CisgICAgZWRqZV9vYmplY3Rfc2l6ZV9taW5fZ2V0KHByaXYtPmN1cnNvck9iamVjdCwgJndpZHRo LCAmaGVpZ2h0KTsKKyAgICBpZiAod2lkdGggPD0gMCB8fCBoZWlnaHQgPD0gMCkKKyAgICAgICAg ZWRqZV9vYmplY3Rfc2l6ZV9taW5fY2FsYyhwcml2LT5jdXJzb3JPYmplY3QsICZ3aWR0aCwgJmhl aWdodCk7CisgICAgaWYgKHdpZHRoIDw9IDAgfHwgaGVpZ2h0IDw9IDApIHsKKyAgICAgICAgd2lk dGggPSBkZWZhdWx0Q3Vyc29yU2l6ZTsKKyAgICAgICAgaGVpZ2h0ID0gZGVmYXVsdEN1cnNvclNp emU7CisgICAgfQorICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZShwcml2LT5jdXJzb3JPYmplY3QsIHdp ZHRoLCBoZWlnaHQpOworCisgICAgY29uc3QgY2hhciogZGF0YTsKKyAgICBpbnQgaG90c3BvdFgg PSAwOworICAgIGRhdGEgPSBlZGplX29iamVjdF9kYXRhX2dldChwcml2LT5jdXJzb3JPYmplY3Qs ICJob3QueCIpOworICAgIGlmIChkYXRhKQorICAgICAgICBob3RzcG90WCA9IGF0b2koZGF0YSk7 CisKKyAgICBpbnQgaG90c3BvdFkgPSAwOworICAgIGRhdGEgPSBlZGplX29iamVjdF9kYXRhX2dl dChwcml2LT5jdXJzb3JPYmplY3QsICJob3QueSIpOworICAgIGlmIChkYXRhKQorICAgICAgICBo b3RzcG90WSA9IGF0b2koZGF0YSk7CisKKyAgICBlY29yZV9ldmFzX29iamVjdF9jdXJzb3Jfc2V0 KGVjb3JlRXZhcywgcHJpdi0+Y3Vyc29yT2JqZWN0LCBFVkFTX0xBWUVSX01BWCwgaG90c3BvdFgs IGhvdHNwb3RZKTsKK30KKwogdm9pZCBld2tfdmlld19kaXNwbGF5KEV2YXNfT2JqZWN0KiBld2tW aWV3LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRV Uk4oZXdrVmlldywgc21hcnREYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaAppbmRleCAzYzljZTk0YTcxNGViNzFlN2ZiOTMw ZjQzNTAyOGI1MGE5YTVkZWNiLi5hMGE2NzkwMDVjOTEyZWIxYmRiMjQ1NzZjOTBjNzk4YWIwYTk1 YjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll d19wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXdfcHJpdmF0ZS5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2Uu aD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgQ3Vyc29yOwogY2xhc3MgSW50UmVjdDsK IGNsYXNzIEludFNpemU7CiB9CkBAIC00Miw2ICs0Myw3IEBAIHR5cGVkZWYgc3RydWN0IF9Fd2tf SW50ZW50IEV3a19JbnRlbnQ7CiB0eXBlZGVmIHN0cnVjdCBfRXdrX0ludGVudF9TZXJ2aWNlIEV3 a19JbnRlbnRfU2VydmljZTsKICNlbmRpZgogCit2b2lkIGV3a192aWV3X2N1cnNvcl9zZXQoRXZh c19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IFdlYkNvcmU6OkN1cnNvciYgY3Vyc29yKTsKIHZvaWQg ZXdrX3ZpZXdfZGlzcGxheShFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgV2ViQ29yZTo6SW50 UmVjdCYgcmVjdCk7CiB2b2lkIGV3a192aWV3X2ltYWdlX2RhdGFfc2V0KEV2YXNfT2JqZWN0KiBl d2tWaWV3LCB2b2lkKiBpbWFnZURhdGEsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNpemUpOwog dm9pZCBld2tfdmlld19sb2FkX2Vycm9yKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBFd2tf V2ViX0Vycm9yKiBlcnJvcik7Cg== 153899 2012-07-23 16:49:52 -0700 2012-07-25 02:16:34 -0700 rebased bug-89140-20120724084943.patch text/plain 7505 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTYxMDllZmEzYTMyM2Qy NDdhMzczYzFmMzM0NmQ3YmFmMTRmYWZkYy4uZWMwYmExNDFiZWU4NGZkYTczMWNmODkxMGMzNjJm ZTBiM2FlM2ViYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA3LTIzICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBld2tfdmlld19jdXJzb3Jfc2V0IHRvIGNoYW5nZSBjdXJzb3IuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTE0MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBld2tfdmlld19jdXJzb3Jf c2V0IHRvIHN1cHBvcnQgY3Vyc29yIGNoYW5nZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBs OjpzZXRDdXJzb3IpOiBDYWxsZWQgZXdrX3ZpZXdfY3Vyc29yX3NldC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChfRXdrX1ZpZXdfUHJpdmF0ZV9E YXRhKToKKyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGE6Ol9Fd2tfVmlld19Qcml2YXRl X0RhdGEpOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YTo6fl9Fd2tfVmlld19Qcml2 YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KTogQ2hlY2sgd2hldGhlciBl Y29yZV94IGNhbiBiZSB1c2VkLgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X2FkZCk6CisgICAg ICAgIENoYW5nZSBvcmRlciBvZiBpbml0aWFsaXphdGlvbiB0byB1c2UgYmFzZSBzdHJ1Y3R1cmUg aW4gX2V3a192aWV3X3ByaXZfbmV3LgorICAgICAgICAoZXdrX3ZpZXdfY3Vyc29yX3NldCk6IEFk ZGVkIHRvIHNldCBjdXJzb3IuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdf cHJpdmF0ZS5oOgorCiAyMDEyLTA3LTIzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFBhcnQgMiBvZjogSW1wbGVtZW50IHN0aWNreSBwb3NpdGlvbmlu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVu dEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudElt cGwuY3BwCmluZGV4IGU2OWY4N2QyODAxMmRlMTUzMGM5MmM5Y2NiMjIxYmRjODIxYzRhZGYuLjEx OGVkYjExZmYxMDE3ZTkyZGY3MDMzZmI1OThiOTA1MTE3ODlhMTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5jcHAKQEAgLTEyMSw5 ICsxMjEsOSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjp0b29sVGlwQ2hhbmdlZChjb25zdCBTdHJp bmcmLCBjb25zdCBTdHJpbmcmKQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgUGFn ZUNsaWVudEltcGw6OnNldEN1cnNvcihjb25zdCBDdXJzb3ImKQordm9pZCBQYWdlQ2xpZW50SW1w bDo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYgY3Vyc29yKQogewotICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgZXdrX3ZpZXdfY3Vyc29yX3NldChtX3ZpZXdXaWRnZXQsIGN1cnNvcik7CiB9CiAK IHZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1cnNvckhpZGRlblVudGlsTW91c2VNb3Zlcyhib29s KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4 IDNmODBhYTExZDU4MTMxODc1YmYzY2E1MGZjMDIwYzk3ZWU5ODY3MTIuLjQ1ZjFjOTg5NDVmMTk5 NDEzNjc3YTNiZmQ5MTA5NjYzY2E4NzJmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTM3LDYgKzM3LDEwIEBACiAjaW5jbHVkZSAiZXdr X3ZpZXdfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a192aWV3X3Jlc291cmNlX2xvYWRfY2xpZW50 X3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tfd2ViX3Jlc291cmNlLmgiCisjaW5jbHVkZSA8RWNv cmVfRXZhcy5oPgorI2luY2x1ZGUgPEVkamUuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0N1cnNvci5o PgorI2luY2x1ZGUgPFdlYkNvcmUvRWZsU2NyZWVuVXRpbGl0aWVzLmg+CiAjaW5jbHVkZSA8d3Rm L3RleHQvQ1N0cmluZy5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwpAQCAtNDQsNiArNDgs OCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogc3RhdGljIGNvbnN0IGNoYXIgRVdLX1ZJ RVdfVFlQRV9TVFJbXSA9ICJFV0syX1ZpZXciOwogCitzdGF0aWMgY29uc3QgaW50IGRlZmF1bHRD dXJzb3JTaXplID0gMTY7CisKIHR5cGVkZWYgSGFzaE1hcDx1aW50NjRfdCwgRXdrX1dlYl9SZXNv dXJjZSo+IExvYWRpbmdSZXNvdXJjZXNNYXA7CiAKIHN0cnVjdCBfRXdrX1ZpZXdfUHJpdmF0ZV9E YXRhIHsKQEAgLTUyLDEzICs1OCwyNCBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7 CiAgICAgY29uc3QgY2hhciogdGl0bGU7CiAgICAgY29uc3QgY2hhciogdGhlbWU7CiAgICAgY29u c3QgY2hhciogY3VzdG9tRW5jb2Rpbmc7CisgICAgY29uc3QgY2hhciogY3Vyc29yR3JvdXA7Cisg ICAgRXZhc19PYmplY3QqIGN1cnNvck9iamVjdDsKICAgICBMb2FkaW5nUmVzb3VyY2VzTWFwIGxv YWRpbmdSZXNvdXJjZXNNYXA7CiAKKyNpZmRlZiBIQVZFX0VDT1JFX1gKKyAgICBib29sIGlzVXNp bmdFY29yZVg7CisjZW5kaWYKKwogICAgIF9Fd2tfVmlld19Qcml2YXRlX0RhdGEoKQogICAgICAg ICA6IHVyaSgwKQogICAgICAgICAsIHRpdGxlKDApCiAgICAgICAgICwgdGhlbWUoMCkKICAgICAg ICAgLCBjdXN0b21FbmNvZGluZygwKQorICAgICAgICAsIGN1cnNvckdyb3VwKDApCisgICAgICAg ICwgY3Vyc29yT2JqZWN0KDApCisjaWZkZWYgSEFWRV9FQ09SRV9YCisgICAgICAgICwgaXNVc2lu Z0Vjb3JlWChmYWxzZSkKKyNlbmRpZgogICAgIHsgfQogCiAgICAgfl9Fd2tfVmlld19Qcml2YXRl X0RhdGEoKQpAQCAtNjcsNiArODQsOSBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7 CiAgICAgICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHRpdGxlKTsKICAgICAgICAgZWluYV9zdHJp bmdzaGFyZV9kZWwodGhlbWUpOwogICAgICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChjdXN0b21F bmNvZGluZyk7CisKKyAgICAgICAgaWYgKGN1cnNvck9iamVjdCkKKyAgICAgICAgICAgIGV2YXNf b2JqZWN0X2RlbChjdXJzb3JPYmplY3QpOwogICAgIH0KIH07CiAKQEAgLTI4NCw2ICszMDQsMTAg QEAgc3RhdGljIEV3a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19W aWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCisj aWZkZWYgSEFWRV9FQ09SRV9YCisgICAgcHJpdi0+aXNVc2luZ0Vjb3JlWCA9IFdlYkNvcmU6Omlz VXNpbmdFY29yZVgoc21hcnREYXRhLT5iYXNlLmV2YXMpOworI2VuZGlmCisKICAgICByZXR1cm4g cHJpdjsKIH0KIApAQCAtMzA5LDkgKzMzMywxMSBAQCBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21h cnRfYWRkKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIH0KIAogICAgIHNtYXJ0RGF0YS0+c2Vs ZiA9IGV3a1ZpZXc7Ci0gICAgc21hcnREYXRhLT5wcml2ID0gX2V3a192aWV3X3ByaXZfbmV3KHNt YXJ0RGF0YSk7CiAgICAgc21hcnREYXRhLT5hcGkgPSBhcGk7CiAKKyAgICBnX3BhcmVudFNtYXJ0 Q2xhc3MuYWRkKGV3a1ZpZXcpOworCisgICAgc21hcnREYXRhLT5wcml2ID0gX2V3a192aWV3X3By aXZfbmV3KHNtYXJ0RGF0YSk7CiAgICAgaWYgKCFzbWFydERhdGEtPnByaXYpIHsKICAgICAgICAg RUlOQV9MT0dfQ1JJVCgiY291bGQgbm90IGFsbG9jYXRlIF9Fd2tfVmlld19Qcml2YXRlX0RhdGEi KTsKICAgICAgICAgZXZhc19vYmplY3Rfc21hcnRfZGF0YV9zZXQoZXdrVmlldywgMCk7CkBAIC0z MTksOCArMzQ1LDYgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0X2FkZChFdmFzX09iamVj dCogZXdrVmlldykKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGdfcGFyZW50U21hcnRD bGFzcy5hZGQoZXdrVmlldyk7Ci0KICAgICAvLyBDcmVhdGUgZXZhc19vYmplY3RfaW1hZ2UgdG8g ZHJhdyB3ZWIgY29udGVudHMuCiAgICAgc21hcnREYXRhLT5pbWFnZSA9IGV2YXNfb2JqZWN0X2lt YWdlX2FkZChzbWFydERhdGEtPmJhc2UuZXZhcyk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2VfYWxw aGFfc2V0KHNtYXJ0RGF0YS0+aW1hZ2UsIGZhbHNlKTsKQEAgLTc2NSw2ICs3ODksNTcgQEAgY29u c3QgY2hhciogZXdrX3ZpZXdfdGhlbWVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQog ICAgIHJldHVybiBwcml2LT50aGVtZTsKIH0KIAordm9pZCBld2tfdmlld19jdXJzb3Jfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBDdXJzb3ImIGN1cnNvcikKK3sKKyAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSk7CisgICAgRVdLX1ZJRVdfUFJJ Vl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdik7CisKKyAgICBjb25zdCBjaGFyKiBncm91 cCA9IGN1cnNvci5wbGF0Zm9ybUN1cnNvcigpOworICAgIGlmICghZ3JvdXAgfHwgZ3JvdXAgPT0g cHJpdi0+Y3Vyc29yR3JvdXApCisgICAgICAgIHJldHVybjsKKyAgICBwcml2LT5jdXJzb3JHcm91 cCA9IGdyb3VwOworCisgICAgaWYgKHByaXYtPmN1cnNvck9iamVjdCkKKyAgICAgICAgZXZhc19v YmplY3RfZGVsKHByaXYtPmN1cnNvck9iamVjdCk7CisgICAgcHJpdi0+Y3Vyc29yT2JqZWN0ID0g ZWRqZV9vYmplY3RfYWRkKHNtYXJ0RGF0YS0+YmFzZS5ldmFzKTsKKworICAgIEVjb3JlX0V2YXMq IGVjb3JlRXZhcyA9IGVjb3JlX2V2YXNfZWNvcmVfZXZhc19nZXQoc21hcnREYXRhLT5iYXNlLmV2 YXMpOworICAgIGlmICghcHJpdi0+dGhlbWUgfHwgIWVkamVfb2JqZWN0X2ZpbGVfc2V0KHByaXYt PmN1cnNvck9iamVjdCwgcHJpdi0+dGhlbWUsIGdyb3VwKSkgeworICAgICAgICBldmFzX29iamVj dF9kZWwocHJpdi0+Y3Vyc29yT2JqZWN0KTsKKyAgICAgICAgcHJpdi0+Y3Vyc29yT2JqZWN0ID0g MDsKKworICAgICAgICBlY29yZV9ldmFzX29iamVjdF9jdXJzb3Jfc2V0KGVjb3JlRXZhcywgMCwg MCwgMCwgMCk7CisjaWZkZWYgSEFWRV9FQ09SRV9YCisgICAgICAgIGlmIChwcml2LT5pc1VzaW5n RWNvcmVYKQorICAgICAgICAgICAgV2ViQ29yZTo6YXBwbHlGYWxsYmFja0N1cnNvcihlY29yZUV2 YXMsIGdyb3VwKTsKKyNlbmRpZgorICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgRXZhc19D b29yZCB3aWR0aCwgaGVpZ2h0OworICAgIGVkamVfb2JqZWN0X3NpemVfbWluX2dldChwcml2LT5j dXJzb3JPYmplY3QsICZ3aWR0aCwgJmhlaWdodCk7CisgICAgaWYgKHdpZHRoIDw9IDAgfHwgaGVp Z2h0IDw9IDApCisgICAgICAgIGVkamVfb2JqZWN0X3NpemVfbWluX2NhbGMocHJpdi0+Y3Vyc29y T2JqZWN0LCAmd2lkdGgsICZoZWlnaHQpOworICAgIGlmICh3aWR0aCA8PSAwIHx8IGhlaWdodCA8 PSAwKSB7CisgICAgICAgIHdpZHRoID0gZGVmYXVsdEN1cnNvclNpemU7CisgICAgICAgIGhlaWdo dCA9IGRlZmF1bHRDdXJzb3JTaXplOworICAgIH0KKyAgICBldmFzX29iamVjdF9yZXNpemUocHJp di0+Y3Vyc29yT2JqZWN0LCB3aWR0aCwgaGVpZ2h0KTsKKworICAgIGNvbnN0IGNoYXIqIGRhdGE7 CisgICAgaW50IGhvdHNwb3RYID0gMDsKKyAgICBkYXRhID0gZWRqZV9vYmplY3RfZGF0YV9nZXQo cHJpdi0+Y3Vyc29yT2JqZWN0LCAiaG90LngiKTsKKyAgICBpZiAoZGF0YSkKKyAgICAgICAgaG90 c3BvdFggPSBhdG9pKGRhdGEpOworCisgICAgaW50IGhvdHNwb3RZID0gMDsKKyAgICBkYXRhID0g ZWRqZV9vYmplY3RfZGF0YV9nZXQocHJpdi0+Y3Vyc29yT2JqZWN0LCAiaG90LnkiKTsKKyAgICBp ZiAoZGF0YSkKKyAgICAgICAgaG90c3BvdFkgPSBhdG9pKGRhdGEpOworCisgICAgZWNvcmVfZXZh c19vYmplY3RfY3Vyc29yX3NldChlY29yZUV2YXMsIHByaXYtPmN1cnNvck9iamVjdCwgRVZBU19M QVlFUl9NQVgsIGhvdHNwb3RYLCBob3RzcG90WSk7Cit9CisKIHZvaWQgZXdrX3ZpZXdfZGlzcGxh eShFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBFV0tf VklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgKaW5kZXggM2M5 Y2U5NGE3MTRlYjcxZTdmYjkzMGY0MzUwMjhiNTBhOWE1ZGVjYi4uYTBhNjc5MDA1YzkxMmViMWJk YjI0NTc2YzkwYzc5OGFiMGE5NWI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1 ZGUgPFdlYktpdDIvV0tCYXNlLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEN1cnNv cjsKIGNsYXNzIEludFJlY3Q7CiBjbGFzcyBJbnRTaXplOwogfQpAQCAtNDIsNiArNDMsNyBAQCB0 eXBlZGVmIHN0cnVjdCBfRXdrX0ludGVudCBFd2tfSW50ZW50OwogdHlwZWRlZiBzdHJ1Y3QgX0V3 a19JbnRlbnRfU2VydmljZSBFd2tfSW50ZW50X1NlcnZpY2U7CiAjZW5kaWYKIAordm9pZCBld2tf dmlld19jdXJzb3Jfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBXZWJDb3JlOjpDdXJz b3ImIGN1cnNvcik7CiB2b2lkIGV3a192aWV3X2Rpc3BsYXkoRXZhc19PYmplY3QqIGV3a1ZpZXcs IGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpOwogdm9pZCBld2tfdmlld19pbWFnZV9kYXRh X3NldChFdmFzX09iamVjdCogZXdrVmlldywgdm9pZCogaW1hZ2VEYXRhLCBjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiBzaXplKTsKIHZvaWQgZXdrX3ZpZXdfbG9hZF9lcnJvcihFdmFzX09iamVjdCog ZXdrVmlldywgY29uc3QgRXdrX1dlYl9FcnJvciogZXJyb3IpOwo=