138490 2014-11-06 19:18:54 -0800 Make it possible to associate snapshots with back/forward list items other than the current item 2014-11-07 12:35:25 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anshu webkit-unassigned andersca commit-queue sam thorton oldest_to_newest 1047007 0 anshu 2014-11-06 19:18:54 -0800 Currently, WKViews can only save snapshots associated with the current back/forward list item. We should extend this to allow snapshots to be associated with any item in the list. <rdar://problem/18901802> 1047122 1 241194 anshu 2014-11-07 11:12:03 -0800 Created attachment 241194 Patch 1047131 2 thorton 2014-11-07 11:39:25 -0800 Looks reasonable to me! Thanks for the patch :) 1047135 3 241197 anshu 2014-11-07 11:52:58 -0800 Created attachment 241197 New patch because I missed an UNUSED_PARAM. :( 1047151 4 241197 commit-queue 2014-11-07 12:35:23 -0800 Comment on attachment 241197 New patch because I missed an UNUSED_PARAM. :( Clearing flags on attachment: 241197 Committed r175759: <http://trac.webkit.org/changeset/175759> 1047152 5 commit-queue 2014-11-07 12:35:25 -0800 All reviewed patches have been landed. Closing bug. 241194 2014-11-07 11:12:03 -0800 2014-11-07 11:52:55 -0800 Patch bug-138490-20141107111213.patch text/plain 6900 anshu U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzc2ODNhMzkxNTIzZWNm ZGFlMDE2ZmVhNjU1ZGU4YzE5YzY3NmUyOS4uZTg4ZTVlMzhiNTcxNGMxOTk4ZTk3OGJkYTM4NDVj NGFkOGVmNmQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTA3ICBBbnNo dSBDaGltYWxhICA8YW5zaHVAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUg dG8gYXNzb2NpYXRlIHNuYXBzaG90cyB3aXRoIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW1zIG90aGVy IHRoYW4gdGhlIGN1cnJlbnQgaXRlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODQ5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6Cisg ICAgICAgIERlY2xhcmUgLXNhdmVCYWNrRm9yd2FyZFNuYXBzaG90Rm9ySXRlbTosIGFuIGFsdGVy bmF0aXZlIHRvIC1zYXZlQmFja0ZvcndhcmRTbmFwc2hvdEZvckN1cnJlbnRJdGVtIHRoYXQgYWNj ZXB0cyBhCisgICAgICAgIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW0gYXMgYW4gYXJndW1lbnQuCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcg c2F2ZUJhY2tGb3J3YXJkU25hcHNob3RGb3JJdGVtOl0pOgorICAgICAgICBQYXNzIHRoZSBwcm92 aWRlZCBiYWNrL2ZvcndhcmQgbGlzdCBpdGVtIGFsb25nIHRvIFdlYlBhZ2VQcm94eTo6cmVjb3Jk TmF2aWdhdGlvblNuYXBzaG90KCkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWNvcmROYXZpZ2F0aW9uU25h cHNob3QpOgorICAgICAgICBPdmVybG9hZGVkIHRvIG9wdGlvbmFsbHkgdGFrZSBhIGJhY2svZm9y d2FyZCBsaXN0IGl0ZW0gYXMgYW4gYXJndW1lbnQuIElmIG9uZSBpc24ndCBwcm92aWRlZCwgZGVm YXVsdCB0byB0aGUgY3VycmVudCBpdGVtCisgICAgICAgIGFzIGJlZm9yZTsgb3RoZXJ3aXNlLCBh c3NvY2lhdGUgdGhlIHNuYXBzaG90IHdpdGggd2hpY2hldmVyIGl0ZW0gd2FzIHByb3ZpZGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgRGVjbGFyZSB0aGUg bmV3IHJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCgpIG92ZXJsb2FkLgorCisgICAgICAgICogVUlQ cm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5oOgorICAgICAgICBNYWtlIHJlY29yZFNuYXBz aG90KCkgdGFrZSBhIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW0gYXMgYW4gYXJndW1lbnQuCisgICAg ICAgICogVUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5tbToKKyAgICAgICAgKFdlYktp dDo6Vmlld1NuYXBzaG90U3RvcmU6OnJlY29yZFNuYXBzaG90KToKKyAgICAgICAgU3RvcmUgdGhl IHNuYXBzaG90IGluIHRoZSBwcm92aWRlZCBiYWNrL2ZvcndhcmQgbGlzdCBpdGVtIGluc3RlYWQg b2YgaW4gdGhlIGN1cnJlbnQgaXRlbS4KKwogMjAxNC0xMS0wNyAgQmV0aCBEYWtpbiAgPGJkYWtp bkBhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBhY3Rpb24gbWVudXMgZm9yIHdoaXRlc3Bh Y2UgaW4gZWRpdGFibGUgYXJlYXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1ZpZXdQcml2YXRlLmgKaW5kZXggNGMwYzZjMDg3N2Q3NWM5NTJjOGVkYmY2MTY5 MzUyZGQzOTdmMjJmMy4uNWFjMGQ1NzE5OWEwMDY3ZDc5YzEyNDQ5Yzc2ODJkNGVjOWQxMTI3ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2 YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2 YXRlLmgKQEAgLTEwOSw2ICsxMDksNyBAQAogLSAodm9pZClzZXRNYWduaWZpY2F0aW9uOihkb3Vi bGUpbWFnbmlmaWNhdGlvbiBjZW50ZXJlZEF0UG9pbnQ6KE5TUG9pbnQpcG9pbnQ7CiAKIC0gKHZv aWQpc2F2ZUJhY2tGb3J3YXJkU25hcHNob3RGb3JDdXJyZW50SXRlbTsKKy0gKHZvaWQpc2F2ZUJh Y2tGb3J3YXJkU25hcHNob3RGb3JJdGVtOihXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYpaXRlbTsK IAogLy8gVmlld3MgbXVzdCBiZSBsYXllci1iYWNrZWQsIGhhdmUgbm8gdHJhbnNmb3JtIGFwcGxp ZWQsIGJlIGluIGJhY2stdG8tZnJvbnQgei1vcmRlciwgYW5kIHRoZSB3aG9sZSBzZXQgbXVzdCBi ZSBhIGNvbnRpZ3VvdXMgb3BhcXVlIHJlY3RhbmdsZS4KIC0gKHZvaWQpX3NldEN1c3RvbVN3aXBl Vmlld3M6KE5TQXJyYXkgKiljdXN0b21Td2lwZVZpZXdzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmluZGV4IGI2ZDM1MDJjNDY0MGJjNzBiZjY4ZTljZThjNTYx YWMzMDc5NGViYTEuLmQxNjRmNTFkNDJiOTJmNTUxNzE2M2Y1YjVhYWQwMTM4OGU5Y2RlZDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTM3MDUsNiAr MzcwNSwxMSBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRo KE5TU3RyaW5nICpwYXRoKQogICAgIF9kYXRhLT5fcGFnZS0+cmVjb3JkTmF2aWdhdGlvblNuYXBz aG90KCk7CiB9CiAKKy0gKHZvaWQpc2F2ZUJhY2tGb3J3YXJkU25hcHNob3RGb3JJdGVtOihXS0Jh Y2tGb3J3YXJkTGlzdEl0ZW1SZWYpaXRlbQoreworICAgIF9kYXRhLT5fcGFnZS0+cmVjb3JkTmF2 aWdhdGlvblNuYXBzaG90KCp0b0ltcGwoaXRlbSkpOworfQorCiAtIChpZClpbml0V2l0aEZyYW1l OihOU1JlY3QpZnJhbWUgY29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRSZWYgcGFnZUdy b3VwUmVmOihXS1BhZ2VHcm91cFJlZilwYWdlR3JvdXBSZWYKIHsKICAgICByZXR1cm4gW3NlbGYg aW5pdFdpdGhGcmFtZTpmcmFtZSBjb250ZXh0UmVmOmNvbnRleHRSZWYgcGFnZUdyb3VwUmVmOnBh Z2VHcm91cFJlZiByZWxhdGVkVG9QYWdlOm5pbF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCmluZGV4IDhjNWMyNjExNTRkMzk2ODJiZWEwODQyYjY1ZjI2Y2E1MGI1 NmU5MjkuLjk2NGM0MzY1NjI1N2MzNjA3OWEyM2JlMjk5OGUwNzhjMWJlZThmYjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC05MDYsMTEgKzkwNiwxNyBA QCB1aW50NjRfdCBXZWJQYWdlUHJveHk6OnJlbG9hZChib29sIHJlbG9hZEZyb21PcmlnaW4pCiAK IHZvaWQgV2ViUGFnZVByb3h5OjpyZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoKQogeworICAgIGlm IChXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJl bnRJdGVtKCkpCisgICAgICAgIHJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCgqaXRlbSk7Cit9CisK K3ZvaWQgV2ViUGFnZVByb3h5OjpyZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoV2ViQmFja0Zvcndh cmRMaXN0SXRlbSYgaXRlbSkKK3sKICAgICBpZiAoIW1fc2hvdWxkUmVjb3JkTmF2aWdhdGlvblNu YXBzaG90cykKICAgICAgICAgcmV0dXJuOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgVmll d1NuYXBzaG90U3RvcmU6OnNoYXJlZCgpLnJlY29yZFNuYXBzaG90KCp0aGlzKTsKKyAgICBWaWV3 U25hcHNob3RTdG9yZTo6c2hhcmVkKCkucmVjb3JkU25hcHNob3QoKnRoaXMsIGl0ZW0pOwogI2Vu ZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBlYjIy NDkxNGY3ODVlMTIzODE4OTI4YjFmNTdiYzFhOWUyYjNmZjI1Li5jYjI0ZDc4ZGY5Nzk4OTk2MGE0 NDQ1ZjZhZTEyZjA0ZGFiMzZlZGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCkBAIC05MDAsNiArOTAwLDcgQEAgcHVibGljOgogICAgIGJvb2wgc2hvdWxkUmVjb3Jk TmF2aWdhdGlvblNuYXBzaG90cygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkUmVjb3JkTmF2aWdh dGlvblNuYXBzaG90czsgfQogICAgIHZvaWQgc2V0U2hvdWxkUmVjb3JkTmF2aWdhdGlvblNuYXBz aG90cyhib29sIHNob3VsZFJlY29yZFNuYXBzaG90cykgeyBtX3Nob3VsZFJlY29yZE5hdmlnYXRp b25TbmFwc2hvdHMgPSBzaG91bGRSZWNvcmRTbmFwc2hvdHM7IH0KICAgICB2b2lkIHJlY29yZE5h dmlnYXRpb25TbmFwc2hvdCgpOworICAgIHZvaWQgcmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIFBhc3NS ZWZQdHI8Vmlld1NuYXBzaG90PiB0YWtlVmlld1NuYXBzaG90KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3JlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3JlLmgKaW5kZXggYmQ4MGQyZjlkNGNh MjViNDk2NjY1YzM0YjVlMWZjZGZmNjE4YjRiNC4uNTgwOTNmYjRiMzY0NjNjNDA2MDIwMGJkNDIz ZGY0ZTBlMjA1ODI5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9W aWV3U25hcHNob3RTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmll d1NuYXBzaG90U3RvcmUuaApAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKIAogICAgIHN0YXRp YyBWaWV3U25hcHNob3RTdG9yZSYgc2hhcmVkKCk7CiAKLSAgICB2b2lkIHJlY29yZFNuYXBzaG90 KFdlYlBhZ2VQcm94eSYpOworICAgIHZvaWQgcmVjb3JkU25hcHNob3QoV2ViUGFnZVByb3h5Jiwg V2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwogCiAgICAgdm9pZCBkaXNjYXJkU25hcHNob3RJbWFn ZXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3U25h cHNob3RTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90 U3RvcmUubW0KaW5kZXggNDRiMzg3ZmRjYTU5NjJlN2VlN2I3YTk1NjNmZWRkM2Q1M2JhMDZmZC4u ZmVmM2JkYzhkNGRkMGE0ODk2MDQzMzFiYzgyMWRhNzhlOGE5MzdhZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3JlLm1tCkBAIC0xMDYsMTkg KzEwNiwxNCBAQCB2b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpwcnVuZVNuYXBzaG90cyhXZWJQYWdl UHJveHkmIHdlYlBhZ2VQcm94eSkKICAgICBtX3NuYXBzaG90c1dpdGhJbWFnZXMuZmlyc3QoKS0+ Y2xlYXJJbWFnZSgpOwogfQogCi12b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpyZWNvcmRTbmFwc2hv dChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKK3ZvaWQgVmlld1NuYXBzaG90U3RvcmU6OnJl Y29yZFNuYXBzaG90KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5LCBXZWJCYWNrRm9yd2FyZExp c3RJdGVtJiBpdGVtKQogewogICAgIGlmICh3ZWJQYWdlUHJveHkuaXNTaG93aW5nTmF2aWdhdGlv bkdlc3R1cmVTbmFwc2hvdCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtKiBpdGVtID0gd2ViUGFnZVByb3h5LmJhY2tGb3J3YXJkTGlzdCgpLmN1cnJlbnRJ dGVtKCk7Ci0KLSAgICBpZiAoIWl0ZW0pCi0gICAgICAgIHJldHVybjsKLQogICAgIHBydW5lU25h cHNob3RzKHdlYlBhZ2VQcm94eSk7CiAKLSAgICB3ZWJQYWdlUHJveHkud2lsbFJlY29yZE5hdmln YXRpb25TbmFwc2hvdCgqaXRlbSk7CisgICAgd2ViUGFnZVByb3h5LndpbGxSZWNvcmROYXZpZ2F0 aW9uU25hcHNob3QoaXRlbSk7CiAKICAgICBSZWZQdHI8Vmlld1NuYXBzaG90PiBzbmFwc2hvdCA9 IHdlYlBhZ2VQcm94eS50YWtlVmlld1NuYXBzaG90KCk7CiAgICAgaWYgKCFzbmFwc2hvdCB8fCAh c25hcHNob3QtPmhhc0ltYWdlKCkpCkBAIC0xMjgsNyArMTIzLDcgQEAgdm9pZCBWaWV3U25hcHNo b3RTdG9yZTo6cmVjb3JkU25hcHNob3QoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCiAgICAg c25hcHNob3QtPnNldERldmljZVNjYWxlRmFjdG9yKHdlYlBhZ2VQcm94eS5kZXZpY2VTY2FsZUZh Y3RvcigpKTsKICAgICBzbmFwc2hvdC0+c2V0QmFja2dyb3VuZENvbG9yKHdlYlBhZ2VQcm94eS5w YWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSk7CiAKLSAgICBpdGVtLT5zZXRTbmFwc2hvdChz bmFwc2hvdC5yZWxlYXNlKCkpOworICAgIGl0ZW0uc2V0U25hcHNob3Qoc25hcHNob3QucmVsZWFz ZSgpKTsKIH0KIAogdm9pZCBWaWV3U25hcHNob3RTdG9yZTo6ZGlzY2FyZFNuYXBzaG90SW1hZ2Vz KCkK 241197 2014-11-07 11:52:58 -0800 2014-11-07 12:35:23 -0800 New patch because I missed an UNUSED_PARAM. :( bug-138490-20141107115309.patch text/plain 6915 anshu U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzc2ODNhMzkxNTIzZWNm ZGFlMDE2ZmVhNjU1ZGU4YzE5YzY3NmUyOS4uZTg4ZTVlMzhiNTcxNGMxOTk4ZTk3OGJkYTM4NDVj NGFkOGVmNmQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTA3ICBBbnNo dSBDaGltYWxhICA8YW5zaHVAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUg dG8gYXNzb2NpYXRlIHNuYXBzaG90cyB3aXRoIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW1zIG90aGVy IHRoYW4gdGhlIGN1cnJlbnQgaXRlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODQ5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6Cisg ICAgICAgIERlY2xhcmUgLXNhdmVCYWNrRm9yd2FyZFNuYXBzaG90Rm9ySXRlbTosIGFuIGFsdGVy bmF0aXZlIHRvIC1zYXZlQmFja0ZvcndhcmRTbmFwc2hvdEZvckN1cnJlbnRJdGVtIHRoYXQgYWNj ZXB0cyBhCisgICAgICAgIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW0gYXMgYW4gYXJndW1lbnQuCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcg c2F2ZUJhY2tGb3J3YXJkU25hcHNob3RGb3JJdGVtOl0pOgorICAgICAgICBQYXNzIHRoZSBwcm92 aWRlZCBiYWNrL2ZvcndhcmQgbGlzdCBpdGVtIGFsb25nIHRvIFdlYlBhZ2VQcm94eTo6cmVjb3Jk TmF2aWdhdGlvblNuYXBzaG90KCkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWNvcmROYXZpZ2F0aW9uU25h cHNob3QpOgorICAgICAgICBPdmVybG9hZGVkIHRvIG9wdGlvbmFsbHkgdGFrZSBhIGJhY2svZm9y d2FyZCBsaXN0IGl0ZW0gYXMgYW4gYXJndW1lbnQuIElmIG9uZSBpc24ndCBwcm92aWRlZCwgZGVm YXVsdCB0byB0aGUgY3VycmVudCBpdGVtCisgICAgICAgIGFzIGJlZm9yZTsgb3RoZXJ3aXNlLCBh c3NvY2lhdGUgdGhlIHNuYXBzaG90IHdpdGggd2hpY2hldmVyIGl0ZW0gd2FzIHByb3ZpZGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgRGVjbGFyZSB0aGUg bmV3IHJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCgpIG92ZXJsb2FkLgorCisgICAgICAgICogVUlQ cm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5oOgorICAgICAgICBNYWtlIHJlY29yZFNuYXBz aG90KCkgdGFrZSBhIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW0gYXMgYW4gYXJndW1lbnQuCisgICAg ICAgICogVUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5tbToKKyAgICAgICAgKFdlYktp dDo6Vmlld1NuYXBzaG90U3RvcmU6OnJlY29yZFNuYXBzaG90KToKKyAgICAgICAgU3RvcmUgdGhl IHNuYXBzaG90IGluIHRoZSBwcm92aWRlZCBiYWNrL2ZvcndhcmQgbGlzdCBpdGVtIGluc3RlYWQg b2YgaW4gdGhlIGN1cnJlbnQgaXRlbS4KKwogMjAxNC0xMS0wNyAgQmV0aCBEYWtpbiAgPGJkYWtp bkBhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBhY3Rpb24gbWVudXMgZm9yIHdoaXRlc3Bh Y2UgaW4gZWRpdGFibGUgYXJlYXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1ZpZXdQcml2YXRlLmgKaW5kZXggNGMwYzZjMDg3N2Q3NWM5NTJjOGVkYmY2MTY5 MzUyZGQzOTdmMjJmMy4uNWFjMGQ1NzE5OWEwMDY3ZDc5YzEyNDQ5Yzc2ODJkNGVjOWQxMTI3ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2 YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2 YXRlLmgKQEAgLTEwOSw2ICsxMDksNyBAQAogLSAodm9pZClzZXRNYWduaWZpY2F0aW9uOihkb3Vi bGUpbWFnbmlmaWNhdGlvbiBjZW50ZXJlZEF0UG9pbnQ6KE5TUG9pbnQpcG9pbnQ7CiAKIC0gKHZv aWQpc2F2ZUJhY2tGb3J3YXJkU25hcHNob3RGb3JDdXJyZW50SXRlbTsKKy0gKHZvaWQpc2F2ZUJh Y2tGb3J3YXJkU25hcHNob3RGb3JJdGVtOihXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYpaXRlbTsK IAogLy8gVmlld3MgbXVzdCBiZSBsYXllci1iYWNrZWQsIGhhdmUgbm8gdHJhbnNmb3JtIGFwcGxp ZWQsIGJlIGluIGJhY2stdG8tZnJvbnQgei1vcmRlciwgYW5kIHRoZSB3aG9sZSBzZXQgbXVzdCBi ZSBhIGNvbnRpZ3VvdXMgb3BhcXVlIHJlY3RhbmdsZS4KIC0gKHZvaWQpX3NldEN1c3RvbVN3aXBl Vmlld3M6KE5TQXJyYXkgKiljdXN0b21Td2lwZVZpZXdzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmluZGV4IGI2ZDM1MDJjNDY0MGJjNzBiZjY4ZTljZThjNTYx YWMzMDc5NGViYTEuLmQxNjRmNTFkNDJiOTJmNTUxNzE2M2Y1YjVhYWQwMTM4OGU5Y2RlZDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTM3MDUsNiAr MzcwNSwxMSBAQCAtICh2b2lkKXNhdmVCYWNrRm9yd2FyZFNuYXBzaG90Rm9yQ3VycmVudEl0ZW0K ICAgICBfZGF0YS0+X3BhZ2UtPnJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCgpOwogfQogCistICh2 b2lkKXNhdmVCYWNrRm9yd2FyZFNuYXBzaG90Rm9ySXRlbTooV0tCYWNrRm9yd2FyZExpc3RJdGVt UmVmKWl0ZW0KK3sKKyAgICBfZGF0YS0+X3BhZ2UtPnJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCgq dG9JbXBsKGl0ZW0pKTsKK30KKwogLSAoaWQpaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZyYW1lIGNv bnRleHRSZWY6KFdLQ29udGV4dFJlZiljb250ZXh0UmVmIHBhZ2VHcm91cFJlZjooV0tQYWdlR3Jv dXBSZWYpcGFnZUdyb3VwUmVmCiB7CiAgICAgcmV0dXJuIFtzZWxmIGluaXRXaXRoRnJhbWU6ZnJh bWUgY29udGV4dFJlZjpjb250ZXh0UmVmIHBhZ2VHcm91cFJlZjpwYWdlR3JvdXBSZWYgcmVsYXRl ZFRvUGFnZTpuaWxdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApp bmRleCA4YzVjMjYxMTU0ZDM5NjgyYmVhMDg0MmI2NWYyNmNhNTBiNTZlOTI5Li42ODk4YTg0MzY0 M2MxYzQyZTk5NTBlNGQ3ZDhiNzNkYTZjY2YwOWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcApAQCAtOTA2LDExICs5MDYsMTkgQEAgdWludDY0X3QgV2ViUGFn ZVByb3h5OjpyZWxvYWQoYm9vbCByZWxvYWRGcm9tT3JpZ2luKQogCiB2b2lkIFdlYlBhZ2VQcm94 eTo6cmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KCkKIHsKKyAgICBpZiAoV2ViQmFja0ZvcndhcmRM aXN0SXRlbSogaXRlbSA9IG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpKQorICAgICAg ICByZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoKml0ZW0pOworfQorCit2b2lkIFdlYlBhZ2VQcm94 eTo6cmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0p Cit7CiAgICAgaWYgKCFtX3Nob3VsZFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdHMpCiAgICAgICAg IHJldHVybjsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIFZpZXdTbmFwc2hvdFN0b3JlOjpz aGFyZWQoKS5yZWNvcmRTbmFwc2hvdCgqdGhpcyk7CisgICAgVmlld1NuYXBzaG90U3RvcmU6OnNo YXJlZCgpLnJlY29yZFNuYXBzaG90KCp0aGlzLCBpdGVtKTsKKyNlbHNlCisgICAgVU5VU0VEX1BB UkFNKGl0ZW0pOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAppbmRleCBlYjIyNDkxNGY3ODVlMTIzODE4OTI4YjFmNTdiYzFhOWUyYjNmZjI1Li5jYjI0 ZDc4ZGY5Nzk4OTk2MGE0NDQ1ZjZhZTEyZjA0ZGFiMzZlZGZiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC05MDAsNiArOTAwLDcgQEAgcHVibGljOgogICAgIGJv b2wgc2hvdWxkUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90cygpIGNvbnN0IHsgcmV0dXJuIG1fc2hv dWxkUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90czsgfQogICAgIHZvaWQgc2V0U2hvdWxkUmVjb3Jk TmF2aWdhdGlvblNuYXBzaG90cyhib29sIHNob3VsZFJlY29yZFNuYXBzaG90cykgeyBtX3Nob3Vs ZFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdHMgPSBzaG91bGRSZWNvcmRTbmFwc2hvdHM7IH0KICAg ICB2b2lkIHJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCgpOworICAgIHZvaWQgcmVjb3JkTmF2aWdh dGlvblNuYXBzaG90KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAogI2lmIFBMQVRGT1JNKENP Q09BKQogICAgIFBhc3NSZWZQdHI8Vmlld1NuYXBzaG90PiB0YWtlVmlld1NuYXBzaG90KCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3Jl LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3JlLmgKaW5k ZXggYmQ4MGQyZjlkNGNhMjViNDk2NjY1YzM0YjVlMWZjZGZmNjE4YjRiNC4uNTgwOTNmYjRiMzY0 NjNjNDA2MDIwMGJkNDIzZGY0ZTBlMjA1ODI5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90U3RvcmUuaApAQCAtMTE3LDcgKzExNyw3IEBAIHB1Ymxp YzoKIAogICAgIHN0YXRpYyBWaWV3U25hcHNob3RTdG9yZSYgc2hhcmVkKCk7CiAKLSAgICB2b2lk IHJlY29yZFNuYXBzaG90KFdlYlBhZ2VQcm94eSYpOworICAgIHZvaWQgcmVjb3JkU25hcHNob3Qo V2ViUGFnZVByb3h5JiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwogCiAgICAgdm9pZCBkaXNj YXJkU25hcHNob3RJbWFnZXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvVmlld1NuYXBzaG90U3RvcmUubW0KaW5kZXggNDRiMzg3ZmRjYTU5NjJlN2VlN2I3YTk1NjNm ZWRkM2Q1M2JhMDZmZC4uZmVmM2JkYzhkNGRkMGE0ODk2MDQzMzFiYzgyMWRhNzhlOGE5MzdhZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9y ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3Jl Lm1tCkBAIC0xMDYsMTkgKzEwNiwxNCBAQCB2b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpwcnVuZVNu YXBzaG90cyhXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKICAgICBtX3NuYXBzaG90c1dpdGhJ bWFnZXMuZmlyc3QoKS0+Y2xlYXJJbWFnZSgpOwogfQogCi12b2lkIFZpZXdTbmFwc2hvdFN0b3Jl OjpyZWNvcmRTbmFwc2hvdChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKK3ZvaWQgVmlld1Nu YXBzaG90U3RvcmU6OnJlY29yZFNuYXBzaG90KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5LCBX ZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtKQogewogICAgIGlmICh3ZWJQYWdlUHJveHkuaXNT aG93aW5nTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdCgpKQogICAgICAgICByZXR1cm47CiAKLSAg ICBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtID0gd2ViUGFnZVByb3h5LmJhY2tGb3J3YXJk TGlzdCgpLmN1cnJlbnRJdGVtKCk7Ci0KLSAgICBpZiAoIWl0ZW0pCi0gICAgICAgIHJldHVybjsK LQogICAgIHBydW5lU25hcHNob3RzKHdlYlBhZ2VQcm94eSk7CiAKLSAgICB3ZWJQYWdlUHJveHku d2lsbFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCgqaXRlbSk7CisgICAgd2ViUGFnZVByb3h5Lndp bGxSZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoaXRlbSk7CiAKICAgICBSZWZQdHI8Vmlld1NuYXBz aG90PiBzbmFwc2hvdCA9IHdlYlBhZ2VQcm94eS50YWtlVmlld1NuYXBzaG90KCk7CiAgICAgaWYg KCFzbmFwc2hvdCB8fCAhc25hcHNob3QtPmhhc0ltYWdlKCkpCkBAIC0xMjgsNyArMTIzLDcgQEAg dm9pZCBWaWV3U25hcHNob3RTdG9yZTo6cmVjb3JkU25hcHNob3QoV2ViUGFnZVByb3h5JiB3ZWJQ YWdlUHJveHkpCiAgICAgc25hcHNob3QtPnNldERldmljZVNjYWxlRmFjdG9yKHdlYlBhZ2VQcm94 eS5kZXZpY2VTY2FsZUZhY3RvcigpKTsKICAgICBzbmFwc2hvdC0+c2V0QmFja2dyb3VuZENvbG9y KHdlYlBhZ2VQcm94eS5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSk7CiAKLSAgICBpdGVt LT5zZXRTbmFwc2hvdChzbmFwc2hvdC5yZWxlYXNlKCkpOworICAgIGl0ZW0uc2V0U25hcHNob3Qo c25hcHNob3QucmVsZWFzZSgpKTsKIH0KIAogdm9pZCBWaWV3U25hcHNob3RTdG9yZTo6ZGlzY2Fy ZFNuYXBzaG90SW1hZ2VzKCkK