100694 2012-10-29 13:36:09 -0700 [BlackBerry] Web page view state should be preserved for pages loaded from page cache 2012-11-01 11:37:52 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 mmatovsky.webkit webkit-unassigned joenotcharles liachen mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 753711 0 mmatovsky.webkit 2012-10-29 13:36:09 -0700 The web page view specific metadata should be preserved for web pages pages loaded from page cache (by using back/forward). This requires web page view state to be saved in and restored from the corresponding page cache history item. 753752 1 171312 mmatovsky.webkit 2012-10-29 14:15:31 -0700 Created attachment 171312 Add logic to persist web view state in page cache. 754392 2 171312 rwlbuis 2012-10-30 08:39:38 -0700 Comment on attachment 171312 Add logic to persist web view state in page cache. This patch needs a ChangeLog. 755565 3 171707 mmatovsky.webkit 2012-10-31 12:59:06 -0700 Created attachment 171707 Add logic to persist web view state in page cache. 755590 4 171707 mmatovsky.webkit 2012-10-31 13:20:20 -0700 Comment on attachment 171707 Add logic to persist web view state in page cache. Please ignore this patch, I forgot the ChangeLog again. 755607 5 171715 mmatovsky.webkit 2012-10-31 14:06:21 -0700 Created attachment 171715 Add logic to persist web view state in page cache. Including the ChangeLog 755687 6 171734 mmatovsky.webkit 2012-10-31 15:47:53 -0700 Created attachment 171734 Add logic to persist web view state in page cache. The patch should now be in the right format. Please review. 756342 7 171734 rwlbuis 2012-11-01 09:27:29 -0700 Comment on attachment 171734 Add logic to persist web view state in page cache. LGTM. 756359 8 171734 webkit.review.bot 2012-11-01 09:46:23 -0700 Comment on attachment 171734 Add logic to persist web view state in page cache. Rejecting attachment 171734 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Kit/chromium/third_party/yasm/source/patched-yasm --revision 154708 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 51>At revision 154708. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/14677590 756491 9 171734 webkit.review.bot 2012-11-01 11:37:48 -0700 Comment on attachment 171734 Add logic to persist web view state in page cache. Clearing flags on attachment: 171734 Committed r133199: <http://trac.webkit.org/changeset/133199> 756492 10 webkit.review.bot 2012-11-01 11:37:52 -0700 All reviewed patches have been landed. Closing bug. 171312 2012-10-29 14:15:31 -0700 2012-10-31 12:59:06 -0700 Add logic to persist web view state in page cache. BUG_100694.patch text/plain 2982 mmatovsky.webkit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvYmxhY2tiZXJyeS9IaXN0b3J5SXRl bVZpZXdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9ibGFja2JlcnJ5L0hpc3RvcnlJ dGVtVmlld1N0YXRlLmgKaW5kZXggZDI1ZGFhMy4uZjJlZmI1ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaGlzdG9yeS9ibGFja2JlcnJ5L0hpc3RvcnlJdGVtVmlld1N0YXRlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaGlzdG9yeS9ibGFja2JlcnJ5L0hpc3RvcnlJdGVtVmlld1N0YXRlLmgK QEAgLTE5LDYgKzE5LDcgQEAKICNpZm5kZWYgSGlzdG9yeUl0ZW1WaWV3U3RhdGVfaAogI2RlZmlu ZSBIaXN0b3J5SXRlbVZpZXdTdGF0ZV9oCiAKKyNpbmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1T dHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewpAQCAtNDYsNiArNDcsNyBAQCBzdHJ1Y3QgSGlzdG9yeUl0ZW1WaWV3U3RhdGUgewog ICAgIGJvb2wgc2hvdWxkUmVmbG93QmxvY2s7CiAgICAgYm9vbCBzaG91bGRTYXZlVmlld1N0YXRl OwogICAgIFN0cmluZyBuZXR3b3JrVG9rZW47CisgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0 cmluZyB3ZWJQYWdlQ2xpZW50U3RhdGU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCmluZGV4IGQwOTc1 ZTIuLmI5NDY4MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNs aWVudC5oCkBAIC0xMTMsNiArMTEzLDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBhZGRN ZXNzYWdlVG9Db25zb2xlKGNvbnN0IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdlLCB1bnNpZ25lZCBt ZXNzYWdlTGVuZ3RoLCBjb25zdCB1bnNpZ25lZCBzaG9ydCogc291cmNlLCB1bnNpZ25lZCBzb3Vy Y2VMZW5ndGgsIHVuc2lnbmVkIGxpbmUKICAgICB2aXJ0dWFsIGludCBzaG93QWxlcnREaWFsb2co QWxlcnRUeXBlKSA9IDA7CiAKKyAgICB2aXJ0dWFsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJp bmcgc2VyaWFsaXplUGFnZUNhY2hlU3RhdGUoKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCB2b2lk IGRlc2VyaWFsaXplUGFnZUNhY2hlU3RhdGUoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0 cmluZyYgc3RhdGUpID0gMDsKKwogICAgIHZpcnR1YWwgdm9pZCBydW5KYXZhU2NyaXB0QWxlcnQo Y29uc3QgdW5zaWduZWQgc2hvcnQqIG1lc3NhZ2UsIHVuc2lnbmVkIG1lc3NhZ2VMZW5ndGgsIGNv bnN0IGNoYXIqIG9yaWdpbiwgdW5zaWduZWQgb3JpZ2luTGVuZ3RoKSA9IDA7CiAgICAgdmlydHVh bCBib29sIHJ1bkphdmFTY3JpcHRDb25maXJtKGNvbnN0IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdl LCB1bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25zdCBjaGFyKiBvcmlnaW4sIHVuc2lnbmVkIG9y aWdpbkxlbmd0aCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBydW5KYXZhU2NyaXB0UHJvbXB0KGNv bnN0IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdlLCB1bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25z dCB1bnNpZ25lZCBzaG9ydCogZGVmYXVsdFZhbHVlLCB1bnNpZ25lZCBkZWZhdWx0VmFsdWVMZW5n dGgsIGMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXgg Y2IwMTUzYy4uNDkyM2VhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tC ZXJyeS5jcHAKQEAgLTEwMzksNiArMTAzOSw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5OjpzYXZlVmlld1N0YXRlVG9JdGVtKEhpc3RvcnlJdGVtKiBpdGVtKQogICAgICAgICB2 aWV3U3RhdGUubWluaW11bVNjYWxlID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV9taW5pbXVtU2NhbGU7 CiAgICAgICAgIHZpZXdTdGF0ZS5tYXhpbXVtU2NhbGUgPSBtX3dlYlBhZ2VQcml2YXRlLT5tX21h eGltdW1TY2FsZTsKICAgICAgICAgdmlld1N0YXRlLmlzVXNlclNjYWxhYmxlID0gbV93ZWJQYWdl UHJpdmF0ZS0+bV91c2VyU2NhbGFibGU7CisgICAgICAgIHZpZXdTdGF0ZS53ZWJQYWdlQ2xpZW50 U3RhdGUgPSBtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVudC0+c2VyaWFsaXplUGFnZUNhY2hlU3Rh dGUoKTsKICAgICB9CiB9CiAKQEAgLTEwNTYsNiArMTA1Nyw5IEBAIHZvaWQgRnJhbWVMb2FkZXJD bGllbnRCbGFja0JlcnJ5OjpyZXN0b3JlVmlld1N0YXRlKCkKICAgICBIaXN0b3J5SXRlbVZpZXdT dGF0ZSYgdmlld1N0YXRlID0gY3VycmVudEl0ZW0tPnZpZXdTdGF0ZSgpOwogICAgIGlmICghdmll d1N0YXRlLnNob3VsZFNhdmVWaWV3U3RhdGUpCiAgICAgICAgIHJldHVybjsKKworICAgIG1fd2Vi UGFnZVByaXZhdGUtPm1fY2xpZW50LT5kZXNlcmlhbGl6ZVBhZ2VDYWNoZVN0YXRlKHZpZXdTdGF0 ZS53ZWJQYWdlQ2xpZW50U3RhdGUpOworCiAgICAgLy8gV2ViUGFnZVByaXZhdGUgaXMgbWVzc2lu ZyB1cCBGcmFtZVZpZXc6Ondhc1Njcm9sbGVkQnlVc2VyKCkgYnkgc2VuZGluZwogICAgIC8vIHNj cm9sbCBldmVudHMgdGhhdCBsb29rIGxpa2UgdGhleSB3ZXJlIHVzZXIgZ2VuZXJhdGVkIGFsbCB0 aGUgdGltZS4KICAgICAvLwoK 171707 2012-10-31 12:59:06 -0700 2012-10-31 13:20:20 -0700 Add logic to persist web view state in page cache. BUG_100694.patch text/plain 4175 mmatovsky.webkit Y29tbWl0IDVkNTkzYzE4ZmE2MjM1NmJiNmE3NmEzYzZlYTc5ODJkMjRjMjMwNzAKQXV0aG9yOiBN aWNoYWVsIE1hdG92c2t5IDxtbWF0b3Zza3lAcmltLmNvbT4KRGF0ZTogICBGcmkgT2N0IDI2IDE4 OjUwOjA2IDIwMTIgLTA0MDAKCiAgICBbQmxhY2tCZXJyeV0gV2ViIHBhZ2UgdmlldyBzdGF0ZSBz aG91bGQgYmUgcHJlc2VydmVkIGZvciBwYWdlcyBsb2FkZWQgZnJvbSBwYWdlIGNhY2hlCiAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNjk0CiAgICAKICAgIFRo aXMgY2hhbmdlIGlzIHJlcXVpcmVkIHRvIHJlc29sdmUgUFIgMjIwNDg4CiAgICAKICAgIFRoZSB3 ZWIgcGFnZSB2aWV3IHNwZWNpZmljIG1ldGFkYXRhIHNob3VsZCBiZSBwcmVzZXJ2ZWQgZm9yIHdl YiBwYWdlcyBwYWdlcyBsb2FkZWQgZnJvbSBwYWdlIGNhY2hlIChieSB1c2luZyBiYWNrL2Zvcndh cmQpLgogICAgVGhpcyByZXF1aXJlcyB3ZWIgcGFnZSB2aWV3IHN0YXRlIHRvIGJlIHNhdmVkIGlu IGFuZCByZXN0b3JlZCBmcm9tIHRoZSBjb3JyZXNwb25kaW5nIHBhZ2UgY2FjaGUgaGlzdG9yeSBp dGVtLgogICAgCiAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KICAgIAogICAgU291cmNl L1dlYktpdC9ibGFja2JlcnJ5OgogICAgCiAgICBBZGQgbG9naWMgdG8gc2F2ZS9yZXN0b3JlIHdl YiB2aWV3IHN0YXRlIGluL2Zyb20gcGFnZSBjYWNoZS4KICAgIAogICAgKiBBcGkvV2ViUGFnZUNs aWVudC5oOgogICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnku Y3BwOgogICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6c2F2ZVZpZXdT dGF0ZVRvSXRlbSk6CiAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Ojpy ZXN0b3JlVmlld1N0YXRlKToKICAgIAogICAgU291cmNlL1dlYkNvcmU6CiAgICAKICAgIEFkZCBs b2dpYyB0byBwZXJzaXN0IHdlYiB2aWV3IHN0YXRlIGluIHBhZ2UgY2FjaGUuCiAgICAKICAgICog aGlzdG9yeS9ibGFja2JlcnJ5L0hpc3RvcnlJdGVtVmlld1N0YXRlLmg6CiAgICAoSGlzdG9yeUl0 ZW1WaWV3U3RhdGUpOgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvYmxhY2ti ZXJyeS9IaXN0b3J5SXRlbVZpZXdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9ibGFj a2JlcnJ5L0hpc3RvcnlJdGVtVmlld1N0YXRlLmgKaW5kZXggZDI1ZGFhMy4uZjJlZmI1ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9ibGFja2JlcnJ5L0hpc3RvcnlJdGVtVmll d1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9ibGFja2JlcnJ5L0hpc3RvcnlJ dGVtVmlld1N0YXRlLmgKQEAgLTE5LDYgKzE5LDcgQEAKICNpZm5kZWYgSGlzdG9yeUl0ZW1WaWV3 U3RhdGVfaAogI2RlZmluZSBIaXN0b3J5SXRlbVZpZXdTdGF0ZV9oCiAKKyNpbmNsdWRlIDxCbGFj a0JlcnJ5UGxhdGZvcm1TdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDYsNiArNDcsNyBAQCBzdHJ1Y3QgSGlzdG9yeUl0 ZW1WaWV3U3RhdGUgewogICAgIGJvb2wgc2hvdWxkUmVmbG93QmxvY2s7CiAgICAgYm9vbCBzaG91 bGRTYXZlVmlld1N0YXRlOwogICAgIFN0cmluZyBuZXR3b3JrVG9rZW47CisgICAgQmxhY2tCZXJy eTo6UGxhdGZvcm06OlN0cmluZyB3ZWJQYWdlQ2xpZW50U3RhdGU7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVu dC5oCmluZGV4IGQwOTc1ZTIuLmI5NDY4MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZUNsaWVudC5oCkBAIC0xMTMsNiArMTEzLDkgQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCBhZGRNZXNzYWdlVG9Db25zb2xlKGNvbnN0IHVuc2lnbmVkIHNob3J0KiBtZXNz YWdlLCB1bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25zdCB1bnNpZ25lZCBzaG9ydCogc291cmNl LCB1bnNpZ25lZCBzb3VyY2VMZW5ndGgsIHVuc2lnbmVkIGxpbmVOdW1iZXIpID0gMDsKICAgICB2 aXJ0dWFsIGludCBzaG93QWxlcnREaWFsb2coQWxlcnRUeXBlKSA9IDA7CiAKKyAgICB2aXJ0dWFs IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcgc2VyaWFsaXplUGFnZUNhY2hlU3RhdGUoKSBj b25zdCA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRlc2VyaWFsaXplUGFnZUNhY2hlU3RhdGUoY29u c3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgc3RhdGUpID0gMDsKKwogICAgIHZpcnR1 YWwgdm9pZCBydW5KYXZhU2NyaXB0QWxlcnQoY29uc3QgdW5zaWduZWQgc2hvcnQqIG1lc3NhZ2Us IHVuc2lnbmVkIG1lc3NhZ2VMZW5ndGgsIGNvbnN0IGNoYXIqIG9yaWdpbiwgdW5zaWduZWQgb3Jp Z2luTGVuZ3RoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHJ1bkphdmFTY3JpcHRDb25maXJtKGNv bnN0IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdlLCB1bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25z dCBjaGFyKiBvcmlnaW4sIHVuc2lnbmVkIG9yaWdpbkxlbmd0aCkgPSAwOwogICAgIHZpcnR1YWwg Ym9vbCBydW5KYXZhU2NyaXB0UHJvbXB0KGNvbnN0IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdlLCB1 bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25zdCB1bnNpZ25lZCBzaG9ydCogZGVmYXVsdFZhbHVl LCB1bnNpZ25lZCBkZWZhdWx0VmFsdWVMZW5ndGgsIGNvbnN0IGNoYXIqIG9yaWdpbiwgdW5zaWdu ZWQgb3JpZ2luTGVuZ3RoLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXN1bHQpID0g MDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggY2Iw MTUzYy4uNDkyM2VhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJy eS5jcHAKQEAgLTEwMzksNiArMTAzOSw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFja0Jl cnJ5OjpzYXZlVmlld1N0YXRlVG9JdGVtKEhpc3RvcnlJdGVtKiBpdGVtKQogICAgICAgICB2aWV3 U3RhdGUubWluaW11bVNjYWxlID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV9taW5pbXVtU2NhbGU7CiAg ICAgICAgIHZpZXdTdGF0ZS5tYXhpbXVtU2NhbGUgPSBtX3dlYlBhZ2VQcml2YXRlLT5tX21heGlt dW1TY2FsZTsKICAgICAgICAgdmlld1N0YXRlLmlzVXNlclNjYWxhYmxlID0gbV93ZWJQYWdlUHJp dmF0ZS0+bV91c2VyU2NhbGFibGU7CisgICAgICAgIHZpZXdTdGF0ZS53ZWJQYWdlQ2xpZW50U3Rh dGUgPSBtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVudC0+c2VyaWFsaXplUGFnZUNhY2hlU3RhdGUo KTsKICAgICB9CiB9CiAKQEAgLTEwNTYsNiArMTA1Nyw5IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpyZXN0b3JlVmlld1N0YXRlKCkKICAgICBIaXN0b3J5SXRlbVZpZXdTdGF0 ZSYgdmlld1N0YXRlID0gY3VycmVudEl0ZW0tPnZpZXdTdGF0ZSgpOwogICAgIGlmICghdmlld1N0 YXRlLnNob3VsZFNhdmVWaWV3U3RhdGUpCiAgICAgICAgIHJldHVybjsKKworICAgIG1fd2ViUGFn ZVByaXZhdGUtPm1fY2xpZW50LT5kZXNlcmlhbGl6ZVBhZ2VDYWNoZVN0YXRlKHZpZXdTdGF0ZS53 ZWJQYWdlQ2xpZW50U3RhdGUpOworCiAgICAgLy8gV2ViUGFnZVByaXZhdGUgaXMgbWVzc2luZyB1 cCBGcmFtZVZpZXc6Ondhc1Njcm9sbGVkQnlVc2VyKCkgYnkgc2VuZGluZwogICAgIC8vIHNjcm9s bCBldmVudHMgdGhhdCBsb29rIGxpa2UgdGhleSB3ZXJlIHVzZXIgZ2VuZXJhdGVkIGFsbCB0aGUg dGltZS4KICAgICAvLwo= 171715 2012-10-31 14:06:21 -0700 2012-10-31 14:22:07 -0700 Add logic to persist web view state in page cache. BUG_100694.patch text/plain 5079 mmatovsky.webkit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNTE0NjczLi5jYTQ4MDVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTItMTAtMzEgIE1pY2hhZWwgTWF0b3Zza3kgIDxtbWF0b3Zza3lAcmltLmNvbT4KKwor ICAgICAgICBbQmxhY2tCZXJyeV0gV2ViIHBhZ2UgdmlldyBzdGF0ZSBzaG91bGQgYmUgcHJlc2Vy dmVkIGZvciBwYWdlcyBsb2FkZWQgZnJvbSBwYWdlIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA2OTQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgd2ViIHBhZ2UgdmlldyBzcGVjaWZpYyBt ZXRhZGF0YSBzaG91bGQgYmUgcHJlc2VydmVkIGZvciB3ZWIgcGFnZXMgcGFnZXMgbG9hZGVkIGZy b20gcGFnZSBjYWNoZSAoYnkgdXNpbmcgYmFjay9mb3J3YXJkKS4KKyAgICAgICAgVGhpcyByZXF1 aXJlcyB3ZWIgcGFnZSB2aWV3IHN0YXRlIHRvIGJlIHNhdmVkIGluIGFuZCByZXN0b3JlZCBmcm9t IHRoZSBjb3JyZXNwb25kaW5nIHBhZ2UgY2FjaGUgaGlzdG9yeSBpdGVtLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogaGlzdG9yeS9ibGFja2JlcnJ5L0hpc3Rv cnlJdGVtVmlld1N0YXRlLmg6CisgICAgICAgIChIaXN0b3J5SXRlbVZpZXdTdGF0ZSk6CisKIDIw MTItMDktMTQgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjg1NjguCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9oaXN0b3J5L2JsYWNrYmVycnkvSGlzdG9yeUl0ZW1WaWV3U3RhdGUuaCBiL1Nv dXJjZS9XZWJDb3JlL2hpc3RvcnkvYmxhY2tiZXJyeS9IaXN0b3J5SXRlbVZpZXdTdGF0ZS5oCmlu ZGV4IGQyNWRhYTMuLmYyZWZiNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3Rvcnkv YmxhY2tiZXJyeS9IaXN0b3J5SXRlbVZpZXdTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hp c3RvcnkvYmxhY2tiZXJyeS9IaXN0b3J5SXRlbVZpZXdTdGF0ZS5oCkBAIC0xOSw2ICsxOSw3IEBA CiAjaWZuZGVmIEhpc3RvcnlJdGVtVmlld1N0YXRlX2gKICNkZWZpbmUgSGlzdG9yeUl0ZW1WaWV3 U3RhdGVfaAogCisjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtU3RyaW5nLmg+CiAjaW5jbHVk ZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQ2LDYg KzQ3LDcgQEAgc3RydWN0IEhpc3RvcnlJdGVtVmlld1N0YXRlIHsKICAgICBib29sIHNob3VsZFJl Zmxvd0Jsb2NrOwogICAgIGJvb2wgc2hvdWxkU2F2ZVZpZXdTdGF0ZTsKICAgICBTdHJpbmcgbmV0 d29ya1Rva2VuOworICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcgd2ViUGFnZUNsaWVu dFN0YXRlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaAppbmRleCBkMDk3NWUyLi5iOTQ2ODAwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaApAQCAtMTEzLDYg KzExMyw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgYWRkTWVzc2FnZVRvQ29uc29sZShj b25zdCB1bnNpZ25lZCBzaG9ydCogbWVzc2FnZSwgdW5zaWduZWQgbWVzc2FnZUxlbmd0aCwgY29u c3QgdW5zaWduZWQgc2hvcnQqIHNvdXJjZSwgdW5zaWduZWQgc291cmNlTGVuZ3RoLCB1bnNpZ25l ZCBsaW5lTnVtYmVyKSA9IDA7CiAgICAgdmlydHVhbCBpbnQgc2hvd0FsZXJ0RGlhbG9nKEFsZXJ0 VHlwZSkgPSAwOwogCisgICAgdmlydHVhbCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nIHNl cmlhbGl6ZVBhZ2VDYWNoZVN0YXRlKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkZXNl cmlhbGl6ZVBhZ2VDYWNoZVN0YXRlKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcm IHN0YXRlKSA9IDA7CisKICAgICB2aXJ0dWFsIHZvaWQgcnVuSmF2YVNjcmlwdEFsZXJ0KGNvbnN0 IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdlLCB1bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25zdCBj aGFyKiBvcmlnaW4sIHVuc2lnbmVkIG9yaWdpbkxlbmd0aCkgPSAwOwogICAgIHZpcnR1YWwgYm9v bCBydW5KYXZhU2NyaXB0Q29uZmlybShjb25zdCB1bnNpZ25lZCBzaG9ydCogbWVzc2FnZSwgdW5z aWduZWQgbWVzc2FnZUxlbmd0aCwgY29uc3QgY2hhciogb3JpZ2luLCB1bnNpZ25lZCBvcmlnaW5M ZW5ndGgpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgcnVuSmF2YVNjcmlwdFByb21wdChjb25zdCB1 bnNpZ25lZCBzaG9ydCogbWVzc2FnZSwgdW5zaWduZWQgbWVzc2FnZUxlbmd0aCwgY29uc3QgdW5z aWduZWQgc2hvcnQqIGRlZmF1bHRWYWx1ZSwgdW5zaWduZWQgZGVmYXVsdFZhbHVlTGVuZ3RoLCBj b25zdCBjaGFyKiBvcmlnaW4sIHVuc2lnbmVkIG9yaWdpbkxlbmd0aCwgQmxhY2tCZXJyeTo6UGxh dGZvcm06OlN0cmluZyYgcmVzdWx0KSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1NTRmYWMwZS4uOWZjNzgxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMTAtMzEgIE1pY2hhZWwgTWF0b3Zza3kgIDxtbWF0b3Zza3lA cmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gV2ViIHBhZ2UgdmlldyBzdGF0ZSBzaG91 bGQgYmUgcHJlc2VydmVkIGZvciBwYWdlcyBsb2FkZWQgZnJvbSBwYWdlIGNhY2hlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA2OTQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgd2ViIHBhZ2Ugdmll dyBzcGVjaWZpYyBtZXRhZGF0YSBzaG91bGQgYmUgcHJlc2VydmVkIGZvciB3ZWIgcGFnZXMgcGFn ZXMgbG9hZGVkIGZyb20gcGFnZSBjYWNoZSAoYnkgdXNpbmcgYmFjay9mb3J3YXJkKS4KKyAgICAg ICAgVGhpcyByZXF1aXJlcyB3ZWIgcGFnZSB2aWV3IHN0YXRlIHRvIGJlIHNhdmVkIGluIGFuZCBy ZXN0b3JlZCBmcm9tIHRoZSBjb3JyZXNwb25kaW5nIHBhZ2UgY2FjaGUgaGlzdG9yeSBpdGVtLgor CisgICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzYXZlVmlld1N0YXRlVG9JdGVtKToKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6cmVzdG9yZVZpZXdTdGF0ZSk6 CisKIDIwMTItMTAtMjYgIFNlYW4gV2FuZyAgPFh1ZXdlbi5XYW5nQHRvcmNobW9iaWxlLmNvbS5j bj4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQVNTRVJUIGN1cnJlbnRUaHJlYWRJc0hvbGRpbmdM b2NrKCkgZmFpbGVkIGluIE1hcmtlZEFsbG9jYXRvcjo6YWxsb2NhdGVTbG93Q2FzZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IGNiMDE1M2MuLjQ5 MjNlYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCkBA IC0xMDM5LDYgKzEwMzksNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6c2F2 ZVZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRlbSogaXRlbSkKICAgICAgICAgdmlld1N0YXRlLm1p bmltdW1TY2FsZSA9IG1fd2ViUGFnZVByaXZhdGUtPm1fbWluaW11bVNjYWxlOwogICAgICAgICB2 aWV3U3RhdGUubWF4aW11bVNjYWxlID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV9tYXhpbXVtU2NhbGU7 CiAgICAgICAgIHZpZXdTdGF0ZS5pc1VzZXJTY2FsYWJsZSA9IG1fd2ViUGFnZVByaXZhdGUtPm1f dXNlclNjYWxhYmxlOworICAgICAgICB2aWV3U3RhdGUud2ViUGFnZUNsaWVudFN0YXRlID0gbV93 ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPnNlcmlhbGl6ZVBhZ2VDYWNoZVN0YXRlKCk7CiAgICAg fQogfQogCkBAIC0xMDU2LDYgKzEwNTcsOSBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tC ZXJyeTo6cmVzdG9yZVZpZXdTdGF0ZSgpCiAgICAgSGlzdG9yeUl0ZW1WaWV3U3RhdGUmIHZpZXdT dGF0ZSA9IGN1cnJlbnRJdGVtLT52aWV3U3RhdGUoKTsKICAgICBpZiAoIXZpZXdTdGF0ZS5zaG91 bGRTYXZlVmlld1N0YXRlKQogICAgICAgICByZXR1cm47CisKKyAgICBtX3dlYlBhZ2VQcml2YXRl LT5tX2NsaWVudC0+ZGVzZXJpYWxpemVQYWdlQ2FjaGVTdGF0ZSh2aWV3U3RhdGUud2ViUGFnZUNs aWVudFN0YXRlKTsKKwogICAgIC8vIFdlYlBhZ2VQcml2YXRlIGlzIG1lc3NpbmcgdXAgRnJhbWVW aWV3Ojp3YXNTY3JvbGxlZEJ5VXNlcigpIGJ5IHNlbmRpbmcKICAgICAvLyBzY3JvbGwgZXZlbnRz IHRoYXQgbG9vayBsaWtlIHRoZXkgd2VyZSB1c2VyIGdlbmVyYXRlZCBhbGwgdGhlIHRpbWUuCiAg ICAgLy8K 171734 2012-10-31 15:47:53 -0700 2012-11-01 11:37:48 -0700 Add logic to persist web view state in page cache. BUG_100694.patch text/plain 5269 mmatovsky.webkit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNTE0NjczLi44YmY5N2Q2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMTAtMzEgIE1pY2hhZWwgTWF0b3Zza3kgIDxtbWF0b3Zza3lAcmltLmNvbT4KKwor ICAgICAgICBbQmxhY2tCZXJyeV0gV2ViIHBhZ2UgdmlldyBzdGF0ZSBzaG91bGQgYmUgcHJlc2Vy dmVkIGZvciBwYWdlcyBsb2FkZWQgZnJvbSBwYWdlIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA2OTQKKyAgICAgICAgSW50ZXJuYWwgUFI6 IDIyMDQ4OAorCisgICAgICAgIEludGVybmFsbHkgcmV2aWV3ZWQgYnkgTGlhbmdodWkgQ2hlbiwg Sm9lIE1hc29uCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSB3ZWIgcGFnZSB2aWV3IHNwZWNpZmljIG1ldGFkYXRhIHNob3VsZCBiZSBwcmVzZXJ2ZWQg Zm9yIHdlYiBwYWdlcyBsb2FkZWQgZnJvbSBwYWdlIGNhY2hlIChieSB1c2luZyBiYWNrL2Zvcndh cmQpLgorICAgICAgICBUaGlzIHJlcXVpcmVzIHdlYiBwYWdlIHZpZXcgc3RhdGUgdG8gYmUgc2F2 ZWQgaW4gYW5kIHJlc3RvcmVkIGZyb20gdGhlIGNvcnJlc3BvbmRpbmcgcGFnZSBjYWNoZSBoaXN0 b3J5IGl0ZW0uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGZvciBwbGF0Zm9ybSBzcGVjaWZpYyBp bnRlcm5hbCBjaGFuZ2UuCisKKyAgICAgICAgKiBoaXN0b3J5L2JsYWNrYmVycnkvSGlzdG9yeUl0 ZW1WaWV3U3RhdGUuaDoKKyAgICAgICAgKEhpc3RvcnlJdGVtVmlld1N0YXRlKToKKwogMjAxMi0w OS0xNCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyODU2OC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2hpc3RvcnkvYmxhY2tiZXJyeS9IaXN0b3J5SXRlbVZpZXdTdGF0ZS5oIGIvU291cmNl L1dlYkNvcmUvaGlzdG9yeS9ibGFja2JlcnJ5L0hpc3RvcnlJdGVtVmlld1N0YXRlLmgKaW5kZXgg ZDI1ZGFhMy4uZjJlZmI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9ibGFj a2JlcnJ5L0hpc3RvcnlJdGVtVmlld1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9y eS9ibGFja2JlcnJ5L0hpc3RvcnlJdGVtVmlld1N0YXRlLmgKQEAgLTE5LDYgKzE5LDcgQEAKICNp Zm5kZWYgSGlzdG9yeUl0ZW1WaWV3U3RhdGVfaAogI2RlZmluZSBIaXN0b3J5SXRlbVZpZXdTdGF0 ZV9oCiAKKyNpbmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1TdHJpbmcuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDYsNiArNDcs NyBAQCBzdHJ1Y3QgSGlzdG9yeUl0ZW1WaWV3U3RhdGUgewogICAgIGJvb2wgc2hvdWxkUmVmbG93 QmxvY2s7CiAgICAgYm9vbCBzaG91bGRTYXZlVmlld1N0YXRlOwogICAgIFN0cmluZyBuZXR3b3Jr VG9rZW47CisgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyB3ZWJQYWdlQ2xpZW50U3Rh dGU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCmluZGV4IGQwOTc1ZTIuLmI5NDY4MDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCkBAIC0xMTMsNiArMTEz LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBhZGRNZXNzYWdlVG9Db25zb2xlKGNvbnN0 IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdlLCB1bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25zdCB1 bnNpZ25lZCBzaG9ydCogc291cmNlLCB1bnNpZ25lZCBzb3VyY2VMZW5ndGgsIHVuc2lnbmVkIGxp bmVOdW1iZXIpID0gMDsKICAgICB2aXJ0dWFsIGludCBzaG93QWxlcnREaWFsb2coQWxlcnRUeXBl KSA9IDA7CiAKKyAgICB2aXJ0dWFsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcgc2VyaWFs aXplUGFnZUNhY2hlU3RhdGUoKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRlc2VyaWFs aXplUGFnZUNhY2hlU3RhdGUoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgc3Rh dGUpID0gMDsKKwogICAgIHZpcnR1YWwgdm9pZCBydW5KYXZhU2NyaXB0QWxlcnQoY29uc3QgdW5z aWduZWQgc2hvcnQqIG1lc3NhZ2UsIHVuc2lnbmVkIG1lc3NhZ2VMZW5ndGgsIGNvbnN0IGNoYXIq IG9yaWdpbiwgdW5zaWduZWQgb3JpZ2luTGVuZ3RoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHJ1 bkphdmFTY3JpcHRDb25maXJtKGNvbnN0IHVuc2lnbmVkIHNob3J0KiBtZXNzYWdlLCB1bnNpZ25l ZCBtZXNzYWdlTGVuZ3RoLCBjb25zdCBjaGFyKiBvcmlnaW4sIHVuc2lnbmVkIG9yaWdpbkxlbmd0 aCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBydW5KYXZhU2NyaXB0UHJvbXB0KGNvbnN0IHVuc2ln bmVkIHNob3J0KiBtZXNzYWdlLCB1bnNpZ25lZCBtZXNzYWdlTGVuZ3RoLCBjb25zdCB1bnNpZ25l ZCBzaG9ydCogZGVmYXVsdFZhbHVlLCB1bnNpZ25lZCBkZWZhdWx0VmFsdWVMZW5ndGgsIGNvbnN0 IGNoYXIqIG9yaWdpbiwgdW5zaWduZWQgb3JpZ2luTGVuZ3RoLCBCbGFja0JlcnJ5OjpQbGF0Zm9y bTo6U3RyaW5nJiByZXN1bHQpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4 IDU1NGZhYzBlLi44YzZmZDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMi0xMC0zMSAgTWljaGFlbCBNYXRvdnNreSAgPG1tYXRvdnNreUByaW0u Y29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBXZWIgcGFnZSB2aWV3IHN0YXRlIHNob3VsZCBi ZSBwcmVzZXJ2ZWQgZm9yIHBhZ2VzIGxvYWRlZCBmcm9tIHBhZ2UgY2FjaGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDY5NAorICAgICAgICBJbnRl cm5hbCBQUjogMjIwNDg4CisKKyAgICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBMaWFuZ2h1 aSBDaGVuLCBKb2UgTWFzb24KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIHdlYiBwYWdlIHZpZXcgc3BlY2lmaWMgbWV0YWRhdGEgc2hvdWxkIGJlIHBy ZXNlcnZlZCBmb3Igd2ViIHBhZ2VzIGxvYWRlZCBmcm9tIHBhZ2UgY2FjaGUgKGJ5IHVzaW5nIGJh Y2svZm9yd2FyZCkuCisgICAgICAgIFRoaXMgcmVxdWlyZXMgd2ViIHBhZ2UgdmlldyBzdGF0ZSB0 byBiZSBzYXZlZCBpbiBhbmQgcmVzdG9yZWQgZnJvbSB0aGUgY29ycmVzcG9uZGluZyBwYWdlIGNh Y2hlIGhpc3RvcnkgaXRlbS4KKworICAgICAgICAqIEFwaS9XZWJQYWdlQ2xpZW50Lmg6CisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6c2F2ZVZpZXdTdGF0 ZVRvSXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6 OnJlc3RvcmVWaWV3U3RhdGUpOgorCiAyMDEyLTEwLTI2ICBTZWFuIFdhbmcgIDxYdWV3ZW4uV2Fu Z0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEFTU0VSVCBjdXJy ZW50VGhyZWFkSXNIb2xkaW5nTG9jaygpIGZhaWxlZCBpbiBNYXJrZWRBbGxvY2F0b3I6OmFsbG9j YXRlU2xvd0Nhc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNw cAppbmRleCBjYjAxNTNjLi40OTIzZWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5LmNwcApAQCAtMTAzOSw2ICsxMDM5LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnk6OnNhdmVWaWV3U3RhdGVUb0l0ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0pCiAg ICAgICAgIHZpZXdTdGF0ZS5taW5pbXVtU2NhbGUgPSBtX3dlYlBhZ2VQcml2YXRlLT5tX21pbmlt dW1TY2FsZTsKICAgICAgICAgdmlld1N0YXRlLm1heGltdW1TY2FsZSA9IG1fd2ViUGFnZVByaXZh dGUtPm1fbWF4aW11bVNjYWxlOwogICAgICAgICB2aWV3U3RhdGUuaXNVc2VyU2NhbGFibGUgPSBt X3dlYlBhZ2VQcml2YXRlLT5tX3VzZXJTY2FsYWJsZTsKKyAgICAgICAgdmlld1N0YXRlLndlYlBh Z2VDbGllbnRTdGF0ZSA9IG1fd2ViUGFnZVByaXZhdGUtPm1fY2xpZW50LT5zZXJpYWxpemVQYWdl Q2FjaGVTdGF0ZSgpOwogICAgIH0KIH0KIApAQCAtMTA1Niw2ICsxMDU3LDkgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnJlc3RvcmVWaWV3U3RhdGUoKQogICAgIEhpc3RvcnlJ dGVtVmlld1N0YXRlJiB2aWV3U3RhdGUgPSBjdXJyZW50SXRlbS0+dmlld1N0YXRlKCk7CiAgICAg aWYgKCF2aWV3U3RhdGUuc2hvdWxkU2F2ZVZpZXdTdGF0ZSkKICAgICAgICAgcmV0dXJuOworCisg ICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPmRlc2VyaWFsaXplUGFnZUNhY2hlU3RhdGUo dmlld1N0YXRlLndlYlBhZ2VDbGllbnRTdGF0ZSk7CisKICAgICAvLyBXZWJQYWdlUHJpdmF0ZSBp cyBtZXNzaW5nIHVwIEZyYW1lVmlldzo6d2FzU2Nyb2xsZWRCeVVzZXIoKSBieSBzZW5kaW5nCiAg ICAgLy8gc2Nyb2xsIGV2ZW50cyB0aGF0IGxvb2sgbGlrZSB0aGV5IHdlcmUgdXNlciBnZW5lcmF0 ZWQgYWxsIHRoZSB0aW1lLgogICAgIC8vCg==