134865 2014-07-12 19:58:11 -0700 [Cocoa] Notify the client when a navigation snapshot is taken 2014-07-14 02:39:41 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz andersca commit-queue jfernandez sam thorton oldest_to_newest 1022072 0 mitz 2014-07-12 19:58:11 -0700 [Cocoa] Notify the client when a navigation snapshot is taken 1022073 1 234821 mitz 2014-07-12 20:12:54 -0700 Created attachment 234821 Add -_webView:willSnapshotBackForwardListItem: 1022074 2 commit-queue 2014-07-12 20:15:07 -0700 Attachment 234821 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Cocoa/NavigationState.h:170: Please declare enum bitfields as unsigned integral types. [runtime/enum_bitfields] [5] Total errors found: 1 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 1022087 3 mitz 2014-07-12 22:52:01 -0700 Committed <http://trac.webkit.org/r171045>. 1022191 4 jfernandez 2014-07-14 02:39:41 -0700 This broke gtk+ build, but it has been fixed in bug #134867 234821 2014-07-12 20:12:54 -0700 2014-07-12 22:42:19 -0700 Add -_webView:willSnapshotBackForwardListItem: bug-134865-20140712201236.patch text/plain 11176 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTA0NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE0LTA3LTEyICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBOb3RpZnkgdGhlIGNs aWVudCB3aGVuIGEgbmF2aWdhdGlvbiBzbmFwc2hvdCBpcyB0YWtlbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0ODY1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL TmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oOiBEZWNsYXJlZCBuZXcgZGVsZWdhdGUgbWV0aG9k LgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6 Ok5hdmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKTogSW5pdGlhbGl6ZSBuZXcg ZmxhZyBpbgorICAgICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMuCisgICAgICAgIChX ZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6d2lsbFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdCk6IEFk ZGVkLiBDYWxscyB0aGUgbmV3CisgICAgICAgIFdLTmF2aWdhdGlvbkRlbGVnYXRlIG1ldGhvZC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6IERlY2xhcmVkIG5ldyBjbGllbnQg ZnVuY3Rpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KTog QWRkZWQuIENhbGxzIHRoZSBuZXcgY2xpZW50IGZ1bmN0aW9uLgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudElt cGxJT1MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tOgor ICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6d2lsbFJlY29yZE5hdmlnYXRpb25TbmFw c2hvdCk6IE92ZXJyaWRlIHRoYXQgY2FsbHMKKyAgICAgICAgTmF2aWdhdGlvblN0YXRlOjp3aWxs UmVjb3JkTmF2aWdhdGlvblNuYXBzaG90LgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9QYWdl Q2xpZW50SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW06 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjp3aWxsUmVjb3JkTmF2aWdhdGlvblNu YXBzaG90KTogRGl0dG8uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0 b3JlLm1tOgorICAgICAgICAoV2ViS2l0OjpWaWV3U25hcHNob3RTdG9yZTo6cmVjb3JkU25hcHNo b3QpOiBBZGRlZCBhIGNhbGwgdG8KKyAgICAgICAgV2ViUGFnZVByb3h5Ojp3aWxsUmVjb3JkTmF2 aWdhdGlvblNuYXBzaG90LgorCiAyMDE0LTA3LTEyICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5r aW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IEVGTCBidWlsZCBicmVh ayBzaW5jZSByMTcxMDM0LgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGll bnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5o CShyZXZpc2lvbiAxNzEwNDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTgsNiArMjk4LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBuYXZpZ2F0aW9uR2VzdHVyZURpZEJlZ2luKCkgPSAwOwogICAgIHZpcnR1YWwgdm9p ZCBuYXZpZ2F0aW9uR2VzdHVyZVdpbGxFbmQoYm9vbCB3aWxsTmF2aWdhdGUsIFdlYkJhY2tGb3J3 YXJkTGlzdEl0ZW0mKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIG5hdmlnYXRpb25HZXN0dXJlRGlk RW5kKGJvb2wgd2lsbE5hdmlnYXRlLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJikgPSAwOworICAg IHZpcnR1YWwgdm9pZCB3aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mKSA9IDA7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAxNzEwNDIpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTE0Myw2ICs1MTQzLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpuYXZpZ2F0aW9uR2Vz dHVyZURpZEUKICAgICBtX3BhZ2VDbGllbnQubmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQod2lsbE5h dmlnYXRlLCBpdGVtKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OndpbGxSZWNvcmROYXZpZ2F0 aW9uU25hcHNob3QoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkKK3sKKyAgICBtX3BhZ2VD bGllbnQud2lsbFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdChpdGVtKTsKK30KKwogdm9pZCBXZWJQ YWdlUHJveHk6Om5hdmlnYXRpb25HZXN0dXJlU25hcHNob3RXYXNSZW1vdmVkKCkKIHsKICAgICBt X2lzU2hvd2luZ05hdmlnYXRpb25HZXN0dXJlU25hcHNob3QgPSBmYWxzZTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE3MTA0MikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAt OTAxLDYgKzkwMSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIG5hdmlnYXRpb25HZXN0dXJlV2lsbEVu ZChib29sIHdpbGxOYXZpZ2F0ZSwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwogICAgIHZvaWQg bmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQoYm9vbCB3aWxsTmF2aWdhdGUsIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mKTsKICAgICB2b2lkIG5hdmlnYXRpb25HZXN0dXJlU25hcHNob3RXYXNSZW1vdmVk KCk7CisgICAgdm9pZCB3aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mKTsKIAogICAgIGJvb2wgaXNTaG93aW5nTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hv dCgpIGNvbnN0IHsgcmV0dXJuIG1faXNTaG93aW5nTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdDsg fQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlv bkRlbGVnYXRlUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgJKHJldmlzaW9uIDE3MTA0 MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVs ZWdhdGVQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0LDcgQEAgdHlwZWRlZiBO U19FTlVNKE5TSW50ZWdlciwgX1dLU2FtZURvY3VtZQogLSAodm9pZClfd2ViVmlld0RpZEVuZE5h dmlnYXRpb25HZXN0dXJlOihXS1dlYlZpZXcgKil3ZWJWaWV3IHdpdGhOYXZpZ2F0aW9uVG9CYWNr Rm9yd2FyZExpc3RJdGVtOihXS0JhY2tGb3J3YXJkTGlzdEl0ZW0gKilpdGVtOwogLy8gT25seSBj YWxsZWQgaWYgaG93IHRoZSBnZXN0dXJlIHdpbGwgZW5kICh3aXRoIG9yIHdpdGhvdXQgbmF2aWdh dGlvbikgaXMga25vd24gYmVmb3JlIGl0IGVuZHMuCiAtICh2b2lkKV93ZWJWaWV3V2lsbEVuZE5h dmlnYXRpb25HZXN0dXJlOihXS1dlYlZpZXcgKil3ZWJWaWV3IHdpdGhOYXZpZ2F0aW9uVG9CYWNr Rm9yd2FyZExpc3RJdGVtOihXS0JhY2tGb3J3YXJkTGlzdEl0ZW0gKilpdGVtOwotCistICh2b2lk KV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHdpbGxTbmFwc2hvdEJhY2tGb3J3YXJkTGlz dEl0ZW06KFdLQmFja0ZvcndhcmRMaXN0SXRlbSAqKWl0ZW07CiAKICNpZiBUQVJHRVRfT1NfSVBI T05FCiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZFN0YXJ0TG9hZEZv clF1aWNrTG9va0RvY3VtZW50SW5NYWluRnJhbWVXaXRoRmlsZU5hbWU6KE5TU3RyaW5nICopZmls ZU5hbWUgdXRpOihOU1N0cmluZyAqKXV0aTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgJKHJldmlzaW9uIDE3MTA0MikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAkod29ya2luZyBj b3B5KQpAQCAtNzgsNiArNzgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBuYXZpZ2F0aW9uR2VzdHVy ZURpZEJlZ2luKCk7CiAgICAgdm9pZCBuYXZpZ2F0aW9uR2VzdHVyZVdpbGxFbmQoYm9vbCB3aWxs TmF2aWdhdGUsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKICAgICB2b2lkIG5hdmlnYXRpb25H ZXN0dXJlRGlkRW5kKGJvb2wgd2lsbE5hdmlnYXRlLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJik7 CisgICAgdm9pZCB3aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW0mKTsKIAogcHJpdmF0ZToKICAgICBjbGFzcyBQb2xpY3lDbGllbnQgOiBwdWJsaWMgQVBJ OjpQb2xpY3lDbGllbnQgewpAQCAtMTY2LDYgKzE2Nyw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJv b2wgd2ViVmlld0RpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmUgOiAxOwogICAgICAgICBib29sIHdl YlZpZXdXaWxsRW5kTmF2aWdhdGlvbkdlc3R1cmVXaXRoTmF2aWdhdGlvblRvQmFja0ZvcndhcmRM aXN0SXRlbSA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZEVuZE5hdmlnYXRpb25HZXN0dXJl V2l0aE5hdmlnYXRpb25Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0gOiAxOworICAgICAgICBib29sIHdl YlZpZXdXaWxsU25hcHNob3RCYWNrRm9yd2FyZExpc3RJdGVtIDogMTsKICNpZiBVU0UoUVVJQ0tf TE9PSykKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkU3RhcnRMb2FkRm9yUXVpY2tMb29rRG9jdW1l bnRJbk1haW5GcmFtZSA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZEZpbmlzaExvYWRGb3JR dWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lIDogMTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQkocmV2aXNpb24gMTcxMDQy KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQko d29ya2luZyBjb3B5KQpAQCAtMTQwLDYgKzE0MCw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpz ZXROYXZpZ2F0aW9uRGVsZWcKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmll d0RpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmUgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3Rvcihfd2ViVmlld0RpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmU6KV07CiAgICAgbV9u YXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXaWxsRW5kTmF2aWdhdGlvbkdlc3R1cmVX aXRoTmF2aWdhdGlvblRvQmFja0ZvcndhcmRMaXN0SXRlbSA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3V2lsbEVuZE5hdmlnYXRpb25HZXN0dXJlOndpdGhO YXZpZ2F0aW9uVG9CYWNrRm9yd2FyZExpc3RJdGVtOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3RGlkRW5kTmF2aWdhdGlvbkdlc3R1cmVXaXRoTmF2aWdhdGlvblRv QmFja0ZvcndhcmRMaXN0SXRlbSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF93ZWJWaWV3RGlkRW5kTmF2aWdhdGlvbkdlc3R1cmU6d2l0aE5hdmlnYXRpb25Ub0JhY2tG b3J3YXJkTGlzdEl0ZW06KV07CisgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZp ZXdXaWxsU25hcHNob3RCYWNrRm9yd2FyZExpc3RJdGVtID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6d2lsbFNuYXBzaG90QmFja0ZvcndhcmRMaXN0SXRl bTopXTsKICNpZiBVU0UoUVVJQ0tfTE9PSykKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0RpZFN0YXJ0TG9hZEZvclF1aWNrTG9va0RvY3VtZW50SW5NYWluRnJhbWUgPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpkaWRTdGFydExv YWRGb3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lV2l0aEZpbGVOYW1lOnV0aTopXTsKICAg ICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZEZpbmlzaExvYWRGb3JRdWlj a0xvb2tEb2N1bWVudEluTWFpbkZyYW1lID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX3dlYlZpZXc6ZGlkRmluaXNoTG9hZEZvclF1aWNrTG9va0RvY3VtZW50SW5NYWlu RnJhbWU6KV07CkBAIC0yOTAsNiArMjkxLDE4IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpuYXZp Z2F0aW9uR2VzdHVyZUQKICAgICBbc3RhdGljX2Nhc3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRl UHJpdmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0ZSkgX3dlYlZpZXdEaWRFbmROYXZpZ2F0aW9uR2Vz dHVyZTptX3dlYlZpZXcgd2l0aE5hdmlnYXRpb25Ub0JhY2tGb3J3YXJkTGlzdEl0ZW06d2lsbE5h dmlnYXRlID8gd3JhcHBlcihpdGVtKSA6IG5pbF07CiB9CiAKK3ZvaWQgTmF2aWdhdGlvblN0YXRl Ojp3aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0 ZW0pCit7CisgICAgaWYgKCFtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dpbGxT bmFwc2hvdEJhY2tGb3J3YXJkTGlzdEl0ZW0pCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8g bmF2aWdhdGlvbkRlbGVnYXRlID0gbV9uYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCk7CisgICAgaWYg KCFuYXZpZ2F0aW9uRGVsZWdhdGUpCisgICAgICAgIHJldHVybjsKKworICAgIFtzdGF0aWNfY2Fz dDxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPj4obmF2aWdhdGlvbkRlbGVnYXRlKSBf d2ViVmlldzptX3dlYlZpZXcgd2lsbFNuYXBzaG90QmFja0ZvcndhcmRMaXN0SXRlbTp3cmFwcGVy KGl0ZW0pXTsKK30KKwogTmF2aWdhdGlvblN0YXRlOjpQb2xpY3lDbGllbnQ6OlBvbGljeUNsaWVu dChOYXZpZ2F0aW9uU3RhdGUmIG5hdmlnYXRpb25TdGF0ZSkKICAgICA6IG1fbmF2aWdhdGlvblN0 YXRlKG5hdmlnYXRpb25TdGF0ZSkKIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvUGFnZUNsaWVudEltcGxJT1MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgJKHJldmlzaW9uIDE3MTA0MikKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaAkod29ya2luZyBjb3B5 KQpAQCAtMTcwLDYgKzE3MCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIG5hdmlnYXRp b25HZXN0dXJlRGlkQmVnaW4oKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgbmF2aWdhdGlv bkdlc3R1cmVXaWxsRW5kKGJvb2wgd2lsbE5hdmlnYXRlLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVt Jikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIG5hdmlnYXRpb25HZXN0dXJlRGlkRW5kKGJv b2wgd2lsbE5hdmlnYXRlLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJikgb3ZlcnJpZGU7CisgICAg dmlydHVhbCB2b2lkIHdpbGxSZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoV2ViQmFja0ZvcndhcmRM aXN0SXRlbSYpIG92ZXJyaWRlOwogCiAgICAgV0tDb250ZW50VmlldyAqbV9jb250ZW50VmlldzsK ICAgICBXS1dlYlZpZXcgKm1fd2ViVmlldzsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQkocmV2aXNpb24gMTcxMDQyKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNjY3LDYgKzY2NywxMSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpuYXZpZ2F0 aW9uR2VzdHVyZURpCiAgICAgTmF2aWdhdGlvblN0YXRlOjpmcm9tV2ViUGFnZSgqbV93ZWJWaWV3 LT5fcGFnZSkubmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQod2lsbE5hdmlnYXRlLCBpdGVtKTsKIH0K IAordm9pZCBQYWdlQ2xpZW50SW1wbDo6d2lsbFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdChXZWJC YWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtKQoreworICAgIE5hdmlnYXRpb25TdGF0ZTo6ZnJvbVdl YlBhZ2UoKm1fd2ViVmlldy0+X3BhZ2UpLndpbGxSZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoaXRl bSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9T KQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwu aAkocmV2aXNpb24gMTcxMDQyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdl Q2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzYsNiArMTc2LDcgQEAgcHJpdmF0ZToK ICAgICB2aXJ0dWFsIHZvaWQgbmF2aWdhdGlvbkdlc3R1cmVEaWRCZWdpbigpIG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgdm9pZCBuYXZpZ2F0aW9uR2VzdHVyZVdpbGxFbmQoYm9vbCB3aWxsTmF2aWdh dGUsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQg bmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQoYm9vbCB3aWxsTmF2aWdhdGUsIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlY29yZE5hdmlnYXRp b25TbmFwc2hvdChXZWJCYWNrRm9yd2FyZExpc3RJdGVtJikgb3ZlcnJpZGU7CiAKICAgICBOU1Zp ZXcgKmFjdGl2ZVZpZXcoKSBjb25zdDsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCShyZXZpc2lvbiAxNzEwNDIpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3JraW5nIGNvcHkpCkBA IC03MTQsNiArNzE0LDE1IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6Om5hdmlnYXRpb25HZXN0dXJl RGkKICNlbmRpZgogfQogCit2b2lkIFBhZ2VDbGllbnRJbXBsOjp3aWxsUmVjb3JkTmF2aWdhdGlv blNuYXBzaG90KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pCit7CisjaWYgV0tfQVBJX0VO QUJMRUQKKyAgICBOYXZpZ2F0aW9uU3RhdGU6OmZyb21XZWJQYWdlKCptX3dlYlZpZXctPl9wYWdl KS53aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KGl0ZW0pOworI2Vsc2UKKyAgICBVTlVTRURf UEFSQU0oaXRlbSk7CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRp ZiAvLyBQTEFURk9STShNQUMpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Zp ZXdTbmFwc2hvdFN0b3JlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvVmlld1NuYXBzaG90U3RvcmUubW0JKHJldmlzaW9uIDE3MTA0MikKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90U3RvcmUubW0JKHdvcmtpbmcgY29weSkK QEAgLTExOSw2ICsxMTksOCBAQCB2b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpyZWNvcmRTbmFwc2hv dChXCiAKICAgICBwcnVuZVNuYXBzaG90cyh3ZWJQYWdlUHJveHkpOwogCisgICAgd2ViUGFnZVBy b3h5LndpbGxSZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoKml0ZW0pOworCiAgICAgUmVmUHRyPFZp ZXdTbmFwc2hvdD4gc25hcHNob3QgPSB3ZWJQYWdlUHJveHkudGFrZVZpZXdTbmFwc2hvdCgpOwog ICAgIGlmICghc25hcHNob3QgfHwgIXNuYXBzaG90LT5oYXNJbWFnZSgpKQogICAgICAgICByZXR1 cm47Cg==