75947 2012-01-10 01:49:45 -0800 [EFL][WK2] Rename viewObject to viewWidget 2012-01-11 02:42:18 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 ryuan.choi ryuan.choi g.czajkowski gyuyoung.kim mrobinson webkit.review.bot oldest_to_newest 532889 0 ryuan.choi 2012-01-10 01:49:45 -0800 Rename viewObject to viewWidget to use WidgetBackingStore which calls viewWidget(). 533458 1 121933 ryuan.choi 2012-01-10 16:16:20 -0800 Created attachment 121933 Patch 533599 2 gyuyoung.kim 2012-01-10 20:19:34 -0800 Looks good to me. But, I think GTK reviewer also agrees with this patch. 533604 3 ryuan.choi 2012-01-10 20:35:56 -0800 Hello martin, Could you take a look at this patch? 533676 4 g.czajkowski 2012-01-10 23:29:33 -0800 Please change title of the bug: remove -> rename as you write in description in ChangeLog. 533701 5 ryuan.choi 2012-01-11 00:13:01 -0800 (In reply to comment #4) > Please change title of the bug: remove -> rename as you write in description in ChangeLog. Oops, Sorry about typo. I'll submit new patch. 533703 6 121988 ryuan.choi 2012-01-11 00:14:45 -0800 Created attachment 121988 Patch 533714 7 121988 ryuan.choi 2012-01-11 00:30:01 -0800 Comment on attachment 121988 Patch Thank you, martin. Always, I appreciate your review. 533768 8 121988 webkit.review.bot 2012-01-11 02:42:12 -0800 Comment on attachment 121988 Patch Clearing flags on attachment: 121988 Committed r104691: <http://trac.webkit.org/changeset/104691> 533769 9 webkit.review.bot 2012-01-11 02:42:18 -0800 All reviewed patches have been landed. Closing bug. 121933 2012-01-10 16:16:20 -0800 2012-01-11 00:14:39 -0800 Patch bug-75947-20120111091619.patch text/plain 5375 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzc5OWExZGRiODQ2Mzlh ZGFjM2FkODRmZmUxZDkzMjkwMjlmMDllZS4uYzIxZTM4YmYyNTUxY2RlNTRjODUyNDFjZDY3MWZi MTIwMjk2MjZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTEwICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFJl bW92ZSB2aWV3T2JqZWN0IHRvIHZpZXdXaWRnZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTc1OTQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIHZpZXdPYmplY3QgdG8gdmlld1dpZGdldCBmb3Ig dGhlIEVGTCBwb3J0IHRvIHVzZSBXaWRnZXRCYWNraW5nU3RvcmUKKyAgICAgICAgd2hpY2ggY2Fs bHMgdmlld1dpZGdldCgpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVu dEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6UGFnZUNsaWVudElt cGwpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2V0Vmlld05lZWRzRGlzcGxh eSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjp2aWV3U2l6ZSk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuaDoKKyAgICAgICAgKFdlYktpdDo6 UGFnZUNsaWVudEltcGw6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBs Ojp2aWV3V2lkZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAg ICAgICogVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OnZpZXdXaWRnZXQpOgorCiAyMDEyLTAxLTEwICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFNub3cgTGVvcGFyZCBidWlsZCBmaXguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1w bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5j cHAKaW5kZXggYWFlZTk1NjNkNTcxZjBmZTUyY2M2Y2QwMWYwMjFlZmMyNTc3YzhhMS4uOWQ5ZDA5 ZGZlZTM3NGIzZjVlYmUzNDZmZGY5MmVmZTJlMWVjMGExOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmNwcApAQCAtMzcsOCArMzcs OCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBh Z2VDbGllbnRJbXBsOjpQYWdlQ2xpZW50SW1wbChXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJQYWdl R3JvdXAqIHBhZ2VHcm91cCwgRXZhc19PYmplY3QqIHZpZXdPYmplY3QpCi0gICAgOiBtX3ZpZXdP YmplY3Qodmlld09iamVjdCkKK1BhZ2VDbGllbnRJbXBsOjpQYWdlQ2xpZW50SW1wbChXZWJDb250 ZXh0KiBjb250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCwgRXZhc19PYmplY3QqIHZpZXdX aWRnZXQpCisgICAgOiBtX3ZpZXdXaWRnZXQodmlld1dpZGdldCkKIHsKICAgICBtX3BhZ2UgPSBj b250ZXh0LT5jcmVhdGVXZWJQYWdlKHRoaXMsIHBhZ2VHcm91cCk7CiAgICAgbV9wYWdlLT5pbml0 aWFsaXplV2ViUGFnZSgpOwpAQCAtNTYsNyArNTYsNyBAQCBQYXNzT3duUHRyPERyYXdpbmdBcmVh UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkKIAogdm9pZCBQ YWdlQ2xpZW50SW1wbDo6c2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiByZWN0KQogewotICAgIGV2YXNfb2JqZWN0X2ltYWdlX2RhdGFfdXBkYXRlX2FkZChtX3ZpZXdP YmplY3QsIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsK KyAgICBldmFzX29iamVjdF9pbWFnZV9kYXRhX3VwZGF0ZV9hZGQobV92aWV3V2lkZ2V0LCByZWN0 LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CiB9CiAKIHZvaWQg UGFnZUNsaWVudEltcGw6OmRpc3BsYXlWaWV3KCkKQEAgLTcyLDcgKzcyLDcgQEAgdm9pZCBQYWdl Q2xpZW50SW1wbDo6c2Nyb2xsVmlldyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzY3JvbGxSZWN0 LCBjb25zdCBXZWJDb3IKIFdlYkNvcmU6OkludFNpemUgUGFnZUNsaWVudEltcGw6OnZpZXdTaXpl KCkKIHsKICAgICBpbnQgd2lkdGgsIGhlaWdodDsKLSAgICBldmFzX29iamVjdF9nZW9tZXRyeV9n ZXQobV92aWV3T2JqZWN0LCAwLCAwLCAmd2lkdGgsICZoZWlnaHQpOworICAgIGV2YXNfb2JqZWN0 X2dlb21ldHJ5X2dldChtX3ZpZXdXaWRnZXQsIDAsIDAsICZ3aWR0aCwgJmhlaWdodCk7CiAgICAg cmV0dXJuIEludFNpemUod2lkdGgsIGhlaWdodCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5oCmluZGV4IDAxYTI0ODNjNzY1ODhk ZDRmOWY4ZWY1Y2Y5NmYzM2JiNGI3MjFlZGEuLjI1MjIxNTNkNDQ3ZWM3NDk4NmM3Mzk4YjM3NjA1 NjA1OTc5MzA3ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L1BhZ2VDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv UGFnZUNsaWVudEltcGwuaApAQCAtMzMsMTMgKzMzLDEzIEBAIG5hbWVzcGFjZSBXZWJLaXQgewog CiBjbGFzcyBQYWdlQ2xpZW50SW1wbCA6IHB1YmxpYyBQYWdlQ2xpZW50IHsKIHB1YmxpYzoKLSAg ICBzdGF0aWMgUGFzc093blB0cjxQYWdlQ2xpZW50SW1wbD4gY3JlYXRlKFdlYkNvbnRleHQqIGNv bnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwLCBFdmFzX09iamVjdCogdmlld09iamVjdCkK KyAgICBzdGF0aWMgUGFzc093blB0cjxQYWdlQ2xpZW50SW1wbD4gY3JlYXRlKFdlYkNvbnRleHQq IGNvbnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwLCBFdmFzX09iamVjdCogdmlld1dpZGdl dCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgUGFnZUNsaWVudEltcGwoY29u dGV4dCwgcGFnZUdyb3VwLCB2aWV3T2JqZWN0KSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihu ZXcgUGFnZUNsaWVudEltcGwoY29udGV4dCwgcGFnZUdyb3VwLCB2aWV3V2lkZ2V0KSk7CiAgICAg fQogICAgIH5QYWdlQ2xpZW50SW1wbCgpOwogCi0gICAgRXZhc19PYmplY3QqIHZpZXdPYmplY3Qo KSBjb25zdCB7IHJldHVybiBtX3ZpZXdPYmplY3Q7IH0KKyAgICBFdmFzX09iamVjdCogdmlld1dp ZGdldCgpIGNvbnN0IHsgcmV0dXJuIG1fdmlld1dpZGdldDsgfQogCiAgICAgV2ViUGFnZVByb3h5 KiBwYWdlKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlLmdldCgpOyB9CiAKQEAgLTEwMCw3ICsxMDAs NyBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG1fcGFn ZTsKLSAgICBFdmFzX09iamVjdCogbV92aWV3T2JqZWN0OworICAgIEV2YXNfT2JqZWN0KiBtX3Zp ZXdXaWRnZXQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjZjUxMzA0MTljNjdlZDgyZGNiMzc3NmQ2N2NmN2Fj MzRjODExYzc5Li4yMGE2MTk1ZDgwOGE4YjhjZWQ2MWNiZWUwZTkxOThiM2JkYjQ5MzdmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xMDcsNiArMTA3LDEyIEBA IGNsYXNzIFdLVmlldzsKICNlbmRpZgogI2VuZGlmCiAKKyNpZiBQTEFURk9STShHVEspCit0eXBl ZGVmIEd0a1dpZGdldCogUGxhdGZvcm1XaWRnZXQ7CisjZWxpZiBQTEFURk9STShFRkwpCit0eXBl ZGVmIEV2YXNfT2JqZWN0KiBQbGF0Zm9ybVdpZGdldDsKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2Vi S2l0IHsKIAogY2xhc3MgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudDsKQEAgLTM1OCwxMSArMzY0LDgg QEAgcHVibGljOgogCiAgICAgSFdORCBuYXRpdmVXaW5kb3coKSBjb25zdDsKICNlbmRpZgotI2lm IFBMQVRGT1JNKEdUSykKLSAgICBHdGtXaWRnZXQqIHZpZXdXaWRnZXQoKTsKLSNlbmRpZgotI2lm IFBMQVRGT1JNKEVGTCkKLSAgICBFdmFzX09iamVjdCogdmlld09iamVjdCgpOworI2lmIFVTRShD QUlSTykKKyAgICBQbGF0Zm9ybVdpZGdldCB2aWV3V2lkZ2V0KCk7CiAjZW5kaWYKICNpZiBVU0Uo VElMRURfQkFDS0lOR19TVE9SRSkKICAgICB2b2lkIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0 KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvV2ViUGFnZVByb3h5RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvV2ViUGFnZVByb3h5RWZsLmNwcAppbmRleCBhZTMxNGI4NTc4NTIxMzYwNjQwZjI2ODUz OWFiNDdmM2U1YzhhNmE5Li5iMDc2YjRlZjY5MzM1OTg0NDVhY2YyN2Q1NzYwMWMxOGFkMTQ3MTE5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlBhZ2VQcm94eUVm bC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwu Y3BwCkBAIC0zMyw5ICszMyw5IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1FdmFzX09iamVj dCogV2ViUGFnZVByb3h5Ojp2aWV3T2JqZWN0KCkKK0V2YXNfT2JqZWN0KiBXZWJQYWdlUHJveHk6 OnZpZXdXaWRnZXQoKQogewotICAgIHJldHVybiBzdGF0aWNfY2FzdDxQYWdlQ2xpZW50SW1wbCo+ KG1fcGFnZUNsaWVudCktPnZpZXdPYmplY3QoKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UGFn ZUNsaWVudEltcGwqPihtX3BhZ2VDbGllbnQpLT52aWV3V2lkZ2V0KCk7CiB9CiAKIFN0cmluZyBX ZWJQYWdlUHJveHk6OnN0YW5kYXJkVXNlckFnZW50KGNvbnN0IFN0cmluZyYgYXBwbGljYXRpb25O YW1lRm9yVXNlckFnZW50KQo= 121988 2012-01-11 00:14:45 -0800 2012-01-11 02:42:12 -0800 Patch bug-75947-20120111171443.patch text/plain 5407 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0Njc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDY0ZDdmZjc2OWU2ZWY2 MDFlZDRjNzI4ZmNkNzhjYzczZWE0YjcxMi4uMGQyOGM3NTgxOGM2MDRjOTI1OGNhMjg1ZjhlNzE5 ZDY0OTM5ZTZjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTExICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFJl bmFtZSB2aWV3T2JqZWN0IHRvIHZpZXdXaWRnZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTc1OTQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIHZpZXdPYmplY3QgdG8gdmlld1dpZGdldCBmb3Ig dGhlIEVGTCBwb3J0IHRvIHVzZSBXaWRnZXRCYWNraW5nU3RvcmUKKyAgICAgICAgd2hpY2ggY2Fs bHMgdmlld1dpZGdldCgpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVu dEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6UGFnZUNsaWVudElt cGwpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2V0Vmlld05lZWRzRGlzcGxh eSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjp2aWV3U2l6ZSk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuaDoKKyAgICAgICAgKFdlYktpdDo6 UGFnZUNsaWVudEltcGw6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBs Ojp2aWV3V2lkZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAg ICAgICogVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OnZpZXdXaWRnZXQpOgorCiAyMDEyLTAxLTEwICBNYXJrIFJvd2UgIDxt cm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjEwNDM3Nyk6IEFsbCBwYWdl cyBwcmludCBibGFuayBvbiBTbm93IExlb3BhcmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmNwcAppbmRleCBhYWVlOTU2M2Q1NzFmMGZl NTJjYzZjZDAxZjAyMWVmYzI1NzdjOGExLi45ZDlkMDlkZmVlMzc0YjNmNWViZTM0NmZkZjkyZWZl MmUxZWMwYTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Q YWdlQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv UGFnZUNsaWVudEltcGwuY3BwCkBAIC0zNyw4ICszNyw4IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUGFnZUNsaWVudEltcGw6OlBhZ2VDbGllbnRJ bXBsKFdlYkNvbnRleHQqIGNvbnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwLCBFdmFzX09i amVjdCogdmlld09iamVjdCkKLSAgICA6IG1fdmlld09iamVjdCh2aWV3T2JqZWN0KQorUGFnZUNs aWVudEltcGw6OlBhZ2VDbGllbnRJbXBsKFdlYkNvbnRleHQqIGNvbnRleHQsIFdlYlBhZ2VHcm91 cCogcGFnZUdyb3VwLCBFdmFzX09iamVjdCogdmlld1dpZGdldCkKKyAgICA6IG1fdmlld1dpZGdl dCh2aWV3V2lkZ2V0KQogewogICAgIG1fcGFnZSA9IGNvbnRleHQtPmNyZWF0ZVdlYlBhZ2UodGhp cywgcGFnZUdyb3VwKTsKICAgICBtX3BhZ2UtPmluaXRpYWxpemVXZWJQYWdlKCk7CkBAIC01Niw3 ICs1Niw3IEBAIFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6OmNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKQogCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVl ZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpCiB7Ci0gICAgZXZhc19vYmpl Y3RfaW1hZ2VfZGF0YV91cGRhdGVfYWRkKG1fdmlld09iamVjdCwgcmVjdC54KCksIHJlY3QueSgp LCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGV2YXNfb2JqZWN0X2ltYWdlX2Rh dGFfdXBkYXRlX2FkZChtX3ZpZXdXaWRnZXQsIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlzcGxheVZp ZXcoKQpAQCAtNzIsNyArNzIsNyBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzY3JvbGxWaWV3KGNv bnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0IFdlYkNvcgogV2ViQ29yZTo6 SW50U2l6ZSBQYWdlQ2xpZW50SW1wbDo6dmlld1NpemUoKQogewogICAgIGludCB3aWR0aCwgaGVp Z2h0OwotICAgIGV2YXNfb2JqZWN0X2dlb21ldHJ5X2dldChtX3ZpZXdPYmplY3QsIDAsIDAsICZ3 aWR0aCwgJmhlaWdodCk7CisgICAgZXZhc19vYmplY3RfZ2VvbWV0cnlfZ2V0KG1fdmlld1dpZGdl dCwgMCwgMCwgJndpZHRoLCAmaGVpZ2h0KTsKICAgICByZXR1cm4gSW50U2l6ZSh3aWR0aCwgaGVp Z2h0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv UGFnZUNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VD bGllbnRJbXBsLmgKaW5kZXggMDFhMjQ4M2M3NjU4OGRkNGY5ZjhlZjVjZjk2ZjMzYmI0YjcyMWVk YS4uMjUyMjE1M2Q0NDdlYzc0OTg2YzczOThiMzc2MDU2MDU5NzkzMDdlNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5oCkBAIC0zMywx MyArMzMsMTMgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFBhZ2VDbGllbnRJbXBsIDog cHVibGljIFBhZ2VDbGllbnQgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFBhZ2VD bGllbnRJbXBsPiBjcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCwgV2ViUGFnZUdyb3VwKiBwYWdl R3JvdXAsIEV2YXNfT2JqZWN0KiB2aWV3T2JqZWN0KQorICAgIHN0YXRpYyBQYXNzT3duUHRyPFBh Z2VDbGllbnRJbXBsPiBjcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCwgV2ViUGFnZUdyb3VwKiBw YWdlR3JvdXAsIEV2YXNfT2JqZWN0KiB2aWV3V2lkZ2V0KQogICAgIHsKLSAgICAgICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBQYWdlQ2xpZW50SW1wbChjb250ZXh0LCBwYWdlR3JvdXAsIHZpZXdPYmpl Y3QpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBQYWdlQ2xpZW50SW1wbChjb250ZXh0 LCBwYWdlR3JvdXAsIHZpZXdXaWRnZXQpKTsKICAgICB9CiAgICAgflBhZ2VDbGllbnRJbXBsKCk7 CiAKLSAgICBFdmFzX09iamVjdCogdmlld09iamVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fdmlld09i amVjdDsgfQorICAgIEV2YXNfT2JqZWN0KiB2aWV3V2lkZ2V0KCkgY29uc3QgeyByZXR1cm4gbV92 aWV3V2lkZ2V0OyB9CiAKICAgICBXZWJQYWdlUHJveHkqIHBhZ2UoKSBjb25zdCB7IHJldHVybiBt X3BhZ2UuZ2V0KCk7IH0KIApAQCAtMTAwLDcgKzEwMCw3IEBAIHByaXZhdGU6CiAKIHByaXZhdGU6 CiAgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gbV9wYWdlOwotICAgIEV2YXNfT2JqZWN0KiBtX3Zp ZXdPYmplY3Q7CisgICAgRXZhc19PYmplY3QqIG1fdmlld1dpZGdldDsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4 IGNmNTEzMDQxOWM2N2VkODJkY2IzNzc2ZDY3Y2Y3YWMzNGM4MTFjNzkuLjIwYTYxOTVkODA4YThi OGNlZDYxY2JlZTBlOTE5OGIzYmRiNDkzN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKQEAgLTEwNyw2ICsxMDcsMTIgQEAgY2xhc3MgV0tWaWV3OwogI2VuZGlmCiAj ZW5kaWYKIAorI2lmIFBMQVRGT1JNKEdUSykKK3R5cGVkZWYgR3RrV2lkZ2V0KiBQbGF0Zm9ybVdp ZGdldDsKKyNlbGlmIFBMQVRGT1JNKEVGTCkKK3R5cGVkZWYgRXZhc19PYmplY3QqIFBsYXRmb3Jt V2lkZ2V0OworI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBOYXRpdmVXZWJL ZXlib2FyZEV2ZW50OwpAQCAtMzU4LDExICszNjQsOCBAQCBwdWJsaWM6CiAKICAgICBIV05EIG5h dGl2ZVdpbmRvdygpIGNvbnN0OwogI2VuZGlmCi0jaWYgUExBVEZPUk0oR1RLKQotICAgIEd0a1dp ZGdldCogdmlld1dpZGdldCgpOwotI2VuZGlmCi0jaWYgUExBVEZPUk0oRUZMKQotICAgIEV2YXNf T2JqZWN0KiB2aWV3T2JqZWN0KCk7CisjaWYgVVNFKENBSVJPKQorICAgIFBsYXRmb3JtV2lkZ2V0 IHZpZXdXaWRnZXQoKTsKICNlbmRpZgogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAg IHZvaWQgc2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlF ZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwuY3Bw CmluZGV4IGFlMzE0Yjg1Nzg1MjEzNjA2NDBmMjY4NTM5YWI0N2YzZTVjOGE2YTkuLmIwNzZiNGVm NjkzMzU5ODQ0NWFjZjI3ZDU3NjAxYzE4YWQxNDcxMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9lZmwvV2ViUGFnZVByb3h5RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL1dlYlBhZ2VQcm94eUVmbC5jcHAKQEAgLTMzLDkgKzMzLDkgQEAKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKLUV2YXNfT2JqZWN0KiBXZWJQYWdlUHJveHk6OnZpZXdPYmpl Y3QoKQorRXZhc19PYmplY3QqIFdlYlBhZ2VQcm94eTo6dmlld1dpZGdldCgpCiB7Ci0gICAgcmV0 dXJuIHN0YXRpY19jYXN0PFBhZ2VDbGllbnRJbXBsKj4obV9wYWdlQ2xpZW50KS0+dmlld09iamVj dCgpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxQYWdlQ2xpZW50SW1wbCo+KG1fcGFnZUNsaWVu dCktPnZpZXdXaWRnZXQoKTsKIH0KIAogU3RyaW5nIFdlYlBhZ2VQcm94eTo6c3RhbmRhcmRVc2Vy QWdlbnQoY29uc3QgU3RyaW5nJiBhcHBsaWNhdGlvbk5hbWVGb3JVc2VyQWdlbnQpCg==