67189 2011-08-30 02:45:38 -0700 [Qt][WK2] Make sure that the visible content rect and the content scale get to the web process in one single message. 2011-09-07 10:22:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte benjamin kbalazs kenneth vestbo webkit.review.bot oldest_to_newest 458804 0 jturcotte 2011-08-30 02:45:38 -0700 [Qt][WK2] Make sure that the visible content rect and the content scale get to the web process in one single message. 458816 1 105608 jturcotte 2011-08-30 03:13:04 -0700 Created attachment 105608 Patch 458817 2 webkit.review.bot 2011-08-30 03:16:05 -0700 Attachment 105608 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp:50: QTouchWebViewPrivate::_q_viewportUpdated is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h:38: _q_viewportUpdated is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style. 458820 3 105608 kenneth 2011-08-30 03:28:49 -0700 Comment on attachment 105608 Patch very nice 463382 4 jturcotte 2011-09-07 09:39:51 -0700 Committed r94673: <http://trac.webkit.org/changeset/94673> 463411 5 kbalazs 2011-09-07 10:15:13 -0700 http/tests/cache/history-only-cached-subresource-loads.html started to fail after this: http://build.webkit.sed.hu/results/x86-32%20Linux%20Qt%20Release%20WebKit2/r94673%20(11431)/results.html 463419 6 kbalazs 2011-09-07 10:22:25 -0700 (In reply to comment #5) > http/tests/cache/history-only-cached-subresource-loads.html started to fail after this: > http://build.webkit.sed.hu/results/x86-32%20Linux%20Qt%20Release%20WebKit2/r94673%20(11431)/results.html The failure has disappeared in the next bot build which was r94675. 105608 2011-08-30 03:13:04 -0700 2011-08-30 03:28:49 -0700 Patch bug-67189-20110830121302.patch text/plain 22908 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTM5NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1ZWYyMzVkOTg1MjE2YmIz NmU1YWRhZjM1MzRiY2UzMTdiZmM5NzkxLi44M2U1NDU1M2NhOWQwYWVkMWZkMjQ3OGZkMTI3ODI4 ODAyNjE1N2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTIgQEAKKzIwMTEtMDgtMzAgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gTWFrZSBzdXJlIHRoYXQgdGhlIHZpc2libGUgY29udGVudCByZWN0IGFuZCB0aGUgY29u dGVudCBzY2FsZSBnZXQgdG8gdGhlIHdlYiBwcm9jZXNzIGluIG9uZSBzaW5nbGUgbWVzc2FnZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3MTg5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFRpbGVk QmFja2luZ1N0b3JlIG5lZWRzIHRvIGtub3cgdGhlIHNjcmVlbiBzaXplIG9mIHRoZSB2aWV3cG9y dCB0byBrbm93IGhvdyBtYW55IHRpbGVzIHRvCisgICAgICAgIGNyZWF0ZSwgYW5kIHNpbmNlIHRo ZSB2aXNpYmxlIGNvbnRlbnQgcmVjdCBpcyBnaXZlbiBpbiBwYWdlIGNvb3JkaW5hdGVzLCB0aGUg Y29udGVudHMgc2NhbGUgaXMKKyAgICAgICAgbmVjZXNzYXJ5IHRvIGNhbGN1bGF0ZSB0aGUgdmll d3BvcnQgc2l6ZS4KKyAgICAgICAgQm90aCB0aGUgcmVjdCBhbmQgdGhlIHNjYWxlIHRoZW4gbmVl ZCB0byBhcnJpdmUgdG8gdGhlIHdlYiBwcm9jZXNzIGF0IHRoZSBzYW1lIHRpbWUgdG8gcHJldmVu dAorICAgICAgICBwaWNraW5nIHRoZSBuZXcgdmlzaWJsZSByZWN0IHdpdGggdGhlIG9sZCBzY2Fs ZSBvciB2aWNlLXZlcnNhIHdoaWNoIGNhbiBwcm9kdWNlIGEgaHVnZSB2aWV3cG9ydCBzaXplCisg ICAgICAgIGFuZCBjcmVhdGUvcmVuZGVyIGFuIGluc2FuZSBhbW91bnQgb2YgdGlsZXMuCisKKyAg ICAgICAgVGhpbmdzIHRoaXMgcGF0Y2ggZG9lczoKKyAgICAgICAgLSBNZXJnZSB0aGUgdmlzaWJs ZSBjb250ZW50cyByZWN0IGFuZCBjb250ZW50IHNjYWxlIGhhbmRsaW5nIHRvZ2V0aGVyLgorICAg ICAgICAtIE1ha2UgUVRvdWNoV2ViVmlldyByZXNwb25zaWJsZSBmb3IgdGVsbGluZyB0aG9zZSB2 aWV3cG9ydCB2YWx1ZXMgdG8gdGhlIHdlYiBwcm9jZXNzIGluc3RlYWQgb2YgUVRvdWNoV2ViUGFn ZS4KKyAgICAgICAgLSBQcmV2ZW50IHVwZGF0aW5nIHRoZSB2aWV3cG9ydCBpbiBWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lIHdoaWxlIGEgcGluY2ggaXMgaW4gcHJvZ3Jlc3MgYW5kIHVwZGF0ZSB0 aGUgdmlld3BvcnQgYXQgdGhlIGVuZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXRv dWNod2VicGFnZS5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdl Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlX3AuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwOgorICAgICAgICAoUVRvdWNo V2ViVmlld1ByaXZhdGU6OlFUb3VjaFdlYlZpZXdQcml2YXRlKToKKyAgICAgICAgKFFUb3VjaFdl YlZpZXdQcml2YXRlOjpfcV92aWV3cG9ydFVwZGF0ZWQpOgorICAgICAgICAoUVRvdWNoV2ViVmll dzo6Z2VvbWV0cnlDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdl YnZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXdfcC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpUaWxlZERyYXdpbmdBcmVhUHJveHk6OnNldFZpc2libGVDb250ZW50UmVjdEFuZFNj YWxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5Lmg6CisgICAg ICAgICogVUlQcm9jZXNzL3F0L1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAgICAg ICAoV2ViS2l0OjpWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lKToKKyAgICAgICAgKFdlYktpdDo6Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6flZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOiBBbGxvd3MgT3duUHRyIHdpdGggdGhlIGZvcndhcmQg ZGVjbGFyYXRpb24gb2YgVmlld3BvcnRVcGRhdGVHdWFyZC4KKyAgICAgICAgKFdlYktpdDo6Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2V0Q29uc3RyYWludHMpOgorICAgICAgICAoV2ViS2l0 OjpWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVTdGFydGVkKToKKyAgICAg ICAgKFdlYktpdDo6Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGluY2hHZXN0dXJlRW5kZWQp OgorICAgICAgICAoV2ViS2l0OjpWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpjb250ZW50Vmll d3BvcnRDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvVmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuY3Bw OgorICAgICAgICAoUVRvdWNoV2ViUGFnZVByb3h5OjpzZXRWaXNpYmxlQ29udGVudFJlY3RBbmRT Y2FsZSk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L3F0b3VjaHdlYnBhZ2Vwcm94eS5oOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oOgorICAgICAgICAoV2ViS2l0 OjpEcmF3aW5nQXJlYTo6c2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlRpbGVkRHJhd2luZ0FyZWE6OnNldFZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5oOgorCiAyMDExLTA4LTI5 ICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAg ICAgW1F0XVtXSzJdIFJlbmFtZSBTR0FnZW50IHRvIFNHVXBkYXRlUXVldWUgdG8gc2hhcnBlbiBp dCdzIHJlc3BvbnNhYmlsaXR5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXRvdWNod2VicGFnZS5jcHAKaW5kZXggMDk2NzJhMDQ5ODEyZTNkN2JkZTQxM2Y1MDQ5YWQ0 NDIyNzk2ODRmMy4uNTBkMmFlN2E2MTU5YjM2NDRkYWYxMDZkNDM3OGEwZjExYjc5MzJjZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3Bw CkBAIC0xNTksMTYgKzE1OSw2IEBAIFFUb3VjaFdlYlBhZ2VQcml2YXRlOjpRVG91Y2hXZWJQYWdl UHJpdmF0ZShRVG91Y2hXZWJQYWdlKiB2aWV3KQogewogfQogCi12b2lkIFFUb3VjaFdlYlBhZ2VQ cml2YXRlOjpfcV9jb21taXRTY2FsZUNoYW5nZSgpCi17Ci0gICAgY29tbWl0U2NhbGVDaGFuZ2Uo KTsKLX0KLQotdm9pZCBRVG91Y2hXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0U2NhbGVDaGFuZ2UoKQot ewotICAgIHBhZ2UtPnNldENvbnRlbnRzU2NhbGUocS0+c2NhbGUoKSk7Ci19Ci0KIHZvaWQgUVRv dWNoV2ViUGFnZVByaXZhdGU6OnNldFBhZ2UoUVRvdWNoV2ViUGFnZVByb3h5KiBwYWdlKQogewog ICAgIEFTU0VSVCghdGhpcy0+cGFnZSk7CkBAIC0xNzYsMTAgKzE2Niw0IEBAIHZvaWQgUVRvdWNo V2ViUGFnZVByaXZhdGU6OnNldFBhZ2UoUVRvdWNoV2ViUGFnZVByb3h5KiBwYWdlKQogICAgIHRo aXMtPnBhZ2UgPSBwYWdlOwogfQogCi12b2lkIFFUb3VjaFdlYlBhZ2VQcml2YXRlOjpzZXRWaWV3 cG9ydFJlY3QoY29uc3QgUVJlY3RGJiB2aWV3cG9ydFJlY3QpCi17Ci0gICAgY29uc3QgUVJlY3RG IHZpc2libGVDb250ZW50UmVjdCA9IHEtPmJvdW5kaW5nUmVjdCgpLmludGVyc2VjdGVkKHZpZXdw b3J0UmVjdCk7Ci0gICAgcGFnZS0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0KHZpc2libGVDb250ZW50 UmVjdCk7Ci19Ci0KICNpbmNsdWRlICJtb2NfcXRvdWNod2VicGFnZS5jcHAiCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5oCmluZGV4IGVmYTAzZDQz NDM0ZmM0OThhNDFjYWMyZmRkZDhkYWMzYTU5ZjIyNDQuLjYwOGM3NTMyMTNmNGE4NTAwMGQ5M2I1 YjVlNTY0NjYxODI0YTViNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXRvdWNod2VicGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXRvdWNod2VicGFnZS5oCkBAIC03OCw4ICs3OCw2IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0 dWFsIHZvaWQgZ2VvbWV0cnlDaGFuZ2VkKGNvbnN0IFFSZWN0RiYsIGNvbnN0IFFSZWN0RiYpOwog CiBwcml2YXRlOgotICAgIFFfUFJJVkFURV9TTE9UKGQsIHZvaWQgX3FfY29tbWl0U2NhbGVDaGFu Z2UoKSk7Ci0KICAgICBRVG91Y2hXZWJQYWdlUHJpdmF0ZSogZDsKICAgICBmcmllbmQgY2xhc3Mg UVRvdWNoV2ViVmlld1ByaXZhdGU7CiAgICAgZnJpZW5kIGNsYXNzIFdlYktpdDo6VG91Y2hWaWV3 SW50ZXJmYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x dG91Y2h3ZWJwYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNo d2VicGFnZV9wLmgKaW5kZXggZDczOGEwMDI3NmIwMjg3ZDY3NDgwMzg5NTBkMjcxOGQ1ZDZiMmZl My4uMDFmYTg4MTViNTNjZjk2YjUwNTNjZDE2NmZiZDQ4NzY2YmMwNzljZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlX3AuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2VfcC5oCkBAIC0zOCwx MCArMzgsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFBhZ2UoUVRvdWNoV2ViUGFnZVByb3h5 Kik7CiAKLSAgICB2b2lkIHNldFZpZXdwb3J0UmVjdChjb25zdCBRUmVjdEYmKTsKLSAgICB2b2lk IF9xX2NvbW1pdFNjYWxlQ2hhbmdlKCk7Ci0gICAgdm9pZCBjb21taXRTY2FsZUNoYW5nZSgpOwot CiAgICAgUVRvdWNoV2ViUGFnZSogY29uc3QgcTsKICAgICBRVG91Y2hXZWJQYWdlUHJveHkqIHBh Z2U7CiAgICAgUVdlYk5hdmlnYXRpb25Db250cm9sbGVyKiBuYXZpZ2F0aW9uQ29udHJvbGxlcjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmll dy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3Bw CmluZGV4IDI2YWFhMzNhNGQyNTA0YmExNjMyYjY5MmU1NThlY2FlYzYxMWQzMDQuLjMzYmQyNjdi ZTUwOTBmN2FkY2ViNTMyZWEyZDUyM2Q5YjEwMzY5YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNwcApAQCAtMzksOCArMzksNyBAQCBR VG91Y2hXZWJWaWV3UHJpdmF0ZTo6UVRvdWNoV2ViVmlld1ByaXZhdGUoUVRvdWNoV2ViVmlldyog cSkKICAgICBRVG91Y2hXZWJQYWdlUHJpdmF0ZSogY29uc3QgcGFnZVZpZXdQcml2YXRlID0gcGFn ZVZpZXcuZGF0YSgpLT5kOwogICAgIHBhZ2VWaWV3UHJpdmF0ZS0+c2V0UGFnZSgmcGFnZSk7CiAK LSAgICBRT2JqZWN0Ojpjb25uZWN0KCZpbnRlcmFjdGlvbkVuZ2luZSwgU0lHTkFMKHZpZXdwb3J0 VXBkYXRlUmVxdWVzdGVkKCkpLCBxLCBTTE9UKF9xX3ZpZXdwb3J0UmVjdFVwZGF0ZWQoKSkpOwot ICAgIFFPYmplY3Q6OmNvbm5lY3QoJmludGVyYWN0aW9uRW5naW5lLCBTSUdOQUwoY29tbWl0U2Nh bGVDaGFuZ2UoKSksIHBhZ2VWaWV3LmRhdGEoKSwgU0xPVChfcV9jb21taXRTY2FsZUNoYW5nZSgp KSk7CisgICAgUU9iamVjdDo6Y29ubmVjdCgmaW50ZXJhY3Rpb25FbmdpbmUsIFNJR05BTCh2aWV3 cG9ydFVwZGF0ZVJlcXVlc3RlZCgpKSwgcSwgU0xPVChfcV92aWV3cG9ydFVwZGF0ZWQoKSkpOwog fQogCiB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpsb2FkRGlkQ29tbWl0KCkKQEAgLTQ4LDEx ICs0NywxMSBAQCB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpsb2FkRGlkQ29tbWl0KCkKICAg ICBpbnRlcmFjdGlvbkVuZ2luZS5yZXNldCgpOwogfQogCi12b2lkIFFUb3VjaFdlYlZpZXdQcml2 YXRlOjpfcV92aWV3cG9ydFJlY3RVcGRhdGVkKCkKK3ZvaWQgUVRvdWNoV2ViVmlld1ByaXZhdGU6 Ol9xX3ZpZXdwb3J0VXBkYXRlZCgpCiB7Ci0gICAgUVRvdWNoV2ViUGFnZVByaXZhdGUqIGNvbnN0 IHBhZ2VWaWV3UHJpdmF0ZSA9IHBhZ2VWaWV3LmRhdGEoKS0+ZDsKLSAgICBjb25zdCBRUmVjdEYg dmlld3BvcnRSZWN0SW5QYWdlVmlld0Nvb3JkaW5hdGUgPSBxLT5tYXBSZWN0VG9JdGVtKHBhZ2VW aWV3LmRhdGEoKSwgcS0+Ym91bmRpbmdSZWN0KCkpOwotICAgIHBhZ2VWaWV3UHJpdmF0ZS0+c2V0 Vmlld3BvcnRSZWN0KHZpZXdwb3J0UmVjdEluUGFnZVZpZXdDb29yZGluYXRlKTsKKyAgICBjb25z dCBRUmVjdEYgdmlzaWJsZVJlY3RJblBhZ2VWaWV3Q29vcmRpbmF0ZSA9IHEtPm1hcFJlY3RUb0l0 ZW0ocGFnZVZpZXcuZGF0YSgpLCBxLT5ib3VuZGluZ1JlY3QoKSkuaW50ZXJzZWN0ZWQocGFnZVZp ZXctPmJvdW5kaW5nUmVjdCgpKTsKKyAgICBmbG9hdCBzY2FsZSA9IHBhZ2VWaWV3LT5zY2FsZSgp OworICAgIHBhZ2Uuc2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUodmlzaWJsZVJlY3RJblBh Z2VWaWV3Q29vcmRpbmF0ZSwgc2NhbGUpOwogfQogCiB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRl Ojp1cGRhdGVWaWV3cG9ydENvbnN0cmFpbnRzKCkKQEAgLTEwNyw3ICsxMDYsNyBAQCB2b2lkIFFU b3VjaFdlYlZpZXc6Omdlb21ldHJ5Q2hhbmdlZChjb25zdCBRUmVjdEYmIG5ld0dlb21ldHJ5LCBj b25zdCBRUmVjdEYmIG9sZAogICAgIFFTR0l0ZW06Omdlb21ldHJ5Q2hhbmdlZChuZXdHZW9tZXRy eSwgb2xkR2VvbWV0cnkpOwogICAgIGlmIChuZXdHZW9tZXRyeS5zaXplKCkgIT0gb2xkR2VvbWV0 cnkuc2l6ZSgpKSB7CiAgICAgICAgIGQtPnVwZGF0ZVZpZXdwb3J0Q29uc3RyYWludHMoKTsKLSAg ICAgICAgZC0+X3Ffdmlld3BvcnRSZWN0VXBkYXRlZCgpOworICAgICAgICBkLT5fcV92aWV3cG9y dFVwZGF0ZWQoKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xdG91Y2h3ZWJ2aWV3LmgKaW5kZXggNzA2MDAyNTQwMTMxZTYyZGZlMjhmMGYzNWVjM2Yx Y2ZhYzQwODRmZi4uYmU2ZDZmNWQ0YjhjMGI1N2ZjNTYzNTZiYzUxMmI2YzkyYTBhOTI4NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmgKQEAg LTQ3LDcgKzQ3LDcgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBnZW9tZXRyeUNoYW5n ZWQoY29uc3QgUVJlY3RGJiwgY29uc3QgUVJlY3RGJik7CiAKIHByaXZhdGU6Ci0gICAgUV9QUklW QVRFX1NMT1QoZCwgdm9pZCBfcV92aWV3cG9ydFJlY3RVcGRhdGVkKCkpOworICAgIFFfUFJJVkFU RV9TTE9UKGQsIHZvaWQgX3Ffdmlld3BvcnRVcGRhdGVkKCkpOwogCiAgICAgZnJpZW5kIGNsYXNz IFdlYktpdDo6VG91Y2hWaWV3SW50ZXJmYWNlOwogICAgIFFUb3VjaFdlYlZpZXdQcml2YXRlICpk OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2 aWV3X3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlld19w LmgKaW5kZXggNzIwMWQ5ZjA1MDYxMzY5MTIxYWY2NzdjNmQ0MTgxZGE2NDU1ZWFlYS4uNmYyMTUy YzBlNTlhYThiMzVhNzRjZjQ5NWE2OTg0ZTVkMWI5NGM2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXdfcC5oCkBAIC0zNSw3ICszNSw3IEBA IHB1YmxpYzoKICAgICBRVG91Y2hXZWJWaWV3UHJpdmF0ZShRVG91Y2hXZWJWaWV3KiBxKTsKIAog ICAgIHZvaWQgbG9hZERpZENvbW1pdCgpOwotICAgIHZvaWQgX3Ffdmlld3BvcnRSZWN0VXBkYXRl ZCgpOworICAgIHZvaWQgX3Ffdmlld3BvcnRVcGRhdGVkKCk7CiAgICAgdm9pZCB1cGRhdGVWaWV3 cG9ydENvbnN0cmFpbnRzKCk7CiAKICAgICB2b2lkIHNldFZpZXdwb3J0QXJndW1lbnRzKGNvbnN0 IFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzJiBhcmdzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5jcHAKaW5kZXggMGM0OWJmNjI3ZjM2 YzA4NTNjZjgzMzdmYTFkZjFiYTFiNDY1ZThiOS4uNDVlM2RmY2MxNDA3OWIyMTE5MGFlMTMzZWM2 MjEwMWZlZGRlY2Q5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVk RHJhd2luZ0FyZWFQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVk RHJhd2luZ0FyZWFQcm94eS5jcHAKQEAgLTU2LDE4ICs1Niw5IEBAIFRpbGVkRHJhd2luZ0FyZWFQ cm94eTo6flRpbGVkRHJhd2luZ0FyZWFQcm94eSgpCiB7CiB9CiAKLXZvaWQgVGlsZWREcmF3aW5n QXJlYVByb3h5OjpzZXRWaXNpYmxlQ29udGVudFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYg dmlzaWJsZUNvbnRlbnRzUmVjdCkKK3ZvaWQgVGlsZWREcmF3aW5nQXJlYVByb3h5OjpzZXRWaXNp YmxlQ29udGVudFJlY3RBbmRTY2FsZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29u dGVudFJlY3QsIGZsb2F0IHNjYWxlKQogewotICAgIC8vIEZJWE1FOiBUaHJvdHRsZSB0aG9zZSBt ZXNzYWdlIGVub3VnaCBub3QgdG8gZmxvb2QgdGhlIElQQyBxdWV1ZSBhbmQgZ2V0IGEgZ29vZCB0 aWxlIGNyZWF0aW9uIHJlc3BvbnNpdmVuZXNzLgotICAgIHBhZ2UoKS0+cHJvY2VzcygpLT5zZW5k KE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0VmlzaWJsZUNvbnRlbnRSZWN0KHZpc2libGVDb250 ZW50c1JlY3QpLCBwYWdlKCktPnBhZ2VJRCgpKTsKLX0KLQotdm9pZCBUaWxlZERyYXdpbmdBcmVh UHJveHk6OnNldENvbnRlbnRzU2NhbGUoZmxvYXQgc2NhbGUpCi17Ci0gICAgLy8gRklYTUU6IFNp bmNlIHRoZSB2aXNpYmxlQ29udGVudFJlY3Qgc2l6ZSBkZXBlbmRzIG9uIHRoZSBzY2FsZSwgdGhl eSBzaG91bGQgZ2V0IHRvIHRoZSB3ZWIgcHJvY2VzcyBpbgotICAgIC8vIG9uZSBzaW5nbGUgbWVz c2FnZSB0byBhdm9pZCB1bmVjZXNzYXJ5IHRpbGUgcmVuZGVyaW5nIGJlY2F1c2Ugb2YgYSBwb3Nz aWJseSB2ZXJ5Ci0gICAgLy8gb3ZlcnNpemVkIGNhbGN1bGF0ZWQgdmlzaWJsZSByZWN0LgotICAg IHBhZ2UoKS0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0Q29udGVu dHNTY2FsZShzY2FsZSksIHBhZ2UoKS0+cGFnZUlEKCkpOworICAgIHBhZ2UoKS0+cHJvY2Vzcygp LT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2Nh bGUodmlzaWJsZUNvbnRlbnRSZWN0LCBzY2FsZSksIHBhZ2UoKS0+cGFnZUlEKCkpOwogfQogCiB2 b2lkIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6cmVuZGVyTmV4dEZyYW1lKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaAppbmRleCAxYmUyNmY3 MDA1YTk5Y2I2ZmJjZmZlYzM5OTVjMWE4NWY2ODdiZjhmLi5hNDI1NzQ1ZjExMmUyMzNiM2JmZjQy NzY2NTFkMTZkMzUwMTY4NzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv VGlsZWREcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Rp bGVkRHJhd2luZ0FyZWFQcm94eS5oCkBAIC03MSw4ICs3MSw3IEBAIHB1YmxpYzoKICAgICBUaWxl ZERyYXdpbmdBcmVhUHJveHkoUGxhdGZvcm1XZWJWaWV3KiwgV2ViUGFnZVByb3h5Kik7CiAgICAg dmlydHVhbCB+VGlsZWREcmF3aW5nQXJlYVByb3h5KCk7CiAKLSAgICB2b2lkIHNldFZpc2libGVD b250ZW50UmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7Ci0gICAgdm9pZCBzZXRDb250ZW50 c1NjYWxlKGZsb2F0KTsKKyAgICB2b2lkIHNldFZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKGNv bnN0IFdlYkNvcmU6OkludFJlY3QmLCBmbG9hdCk7CiAgICAgdm9pZCByZW5kZXJOZXh0RnJhbWUo KTsKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9WaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9WaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcApp bmRleCAyMDM4ODZkMDM2ZTEyYzI3ZTA5YTBiODAwNWE4ZGYxZjY2ODBmYWYzLi41NWRhOTJiOWE3 MTYwNDI2MTRlZTk1Njg2NGFkOThkZDg1ZjdmZDA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvcXQvVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCkBAIC0x OCw4ICsxOCwxMCBAQAogICoKICAqLwogCisjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAi Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oIgogCisjaW5jbHVkZSAiUGFzc093blB0ci5oIgog I2luY2x1ZGUgPFFQb2ludEY+CiAjaW5jbHVkZSA8UXREZWNsYXJhdGl2ZS9xc2dpdGVtLmg+CiAK QEAgLTQyLDYgKzQ0LDggQEAgc3RhdGljIGlubGluZSBRUmVjdEYgY29udGVudFJlY3RJblZpZXdw b3J0Q29vcmRpbmF0ZShjb25zdCBRU0dJdGVtKiBjb250ZW50LCBjb24KIC8vIHRvIHRoZW0gd2hl biB3ZSBhcmUgdGhlIG9uZSBjaGFuZ2luZyB0aGUgY29udGVudC4KIC8vCiAvLyBUaGUgZ3VhcmQg bWFrZSBzdXJlIHRoZSBzaWduYWwgdmlld3BvcnRVcGRhdGVSZXF1ZXN0ZWQoKSBpcyBzZW50IGlm IG5lY2Vzc2FyeS4KKy8vIFdoZW4gbXVsdGlwbGUgZ3VhcmRzIGFyZSBhbGl2ZSwgdGhlaXIgbGlm ZXRpbWUgbXVzdCBiZSBwZXJmZWN0bHkgaW1icmljYXRlZCAoZS5nLiBpZiB1c2VkIG91c2lkZSBz dGFjayBmcmFtZXMpLgorLy8gV2UgcmVseSBvbiB0aGUgZmlyc3Qgb25lIHRvIHRyaWdnZXIgdGhl IHVwZGF0ZSBhdCB0aGUgZW5kIHNpbmNlIGl0IG9ubHkgdXNlcyBvbmUgYm9vbCBpbnRlcm5hbGx5 LgogLy8KIC8vIFRoZSBwdWJsaWMgbWV0aG9kcyBzaG91bGQgY3JlYXRlIHRoZSBndWFyZCBpZiB0 aGV5IG1pZ2h0IHVwZGF0ZSBjb250ZW50LgogY2xhc3MgVmlld3BvcnRVcGRhdGVHdWFyZCB7CkBA IC04MywxMSArODcsMTUgQEAgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZShjb25zdCBRU0dJdGVtKiB2aWV3cG9ydCwgUVMKICAgICAsIG1fcGluY2hT dGFydFNjYWxlKDEuZikKIHsKICAgICByZXNldCgpOwotICAgIGNvbm5lY3QobV9jb250ZW50LCBT SUdOQUwoeENoYW5nZWQoKSksIHRoaXMsIFNMT1QoY29udGVudEdlb21ldHJ5Q2hhbmdlZCgpKSwg UXQ6OkRpcmVjdENvbm5lY3Rpb24pOwotICAgIGNvbm5lY3QobV9jb250ZW50LCBTSUdOQUwoeUNo YW5nZWQoKSksIHRoaXMsIFNMT1QoY29udGVudEdlb21ldHJ5Q2hhbmdlZCgpKSwgUXQ6OkRpcmVj dENvbm5lY3Rpb24pOwotICAgIGNvbm5lY3QobV9jb250ZW50LCBTSUdOQUwod2lkdGhDaGFuZ2Vk KCkpLCB0aGlzLCBTTE9UKGNvbnRlbnRHZW9tZXRyeUNoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25u ZWN0aW9uKTsKLSAgICBjb25uZWN0KG1fY29udGVudCwgU0lHTkFMKGhlaWdodENoYW5nZWQoKSks IHRoaXMsIFNMT1QoY29udGVudEdlb21ldHJ5Q2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rp b24pOwotICAgIGNvbm5lY3QobV9jb250ZW50LCBTSUdOQUwoc2NhbGVDaGFuZ2VkKCkpLCB0aGlz LCBTTE9UKGNvbnRlbnRTY2FsZUNoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAg ICBjb25uZWN0KG1fY29udGVudCwgU0lHTkFMKHhDaGFuZ2VkKCkpLCB0aGlzLCBTTE9UKGNvbnRl bnRWaWV3cG9ydENoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAgICBjb25uZWN0 KG1fY29udGVudCwgU0lHTkFMKHlDaGFuZ2VkKCkpLCB0aGlzLCBTTE9UKGNvbnRlbnRWaWV3cG9y dENoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAgICBjb25uZWN0KG1fY29udGVu dCwgU0lHTkFMKHdpZHRoQ2hhbmdlZCgpKSwgdGhpcywgU0xPVChjb250ZW50Vmlld3BvcnRDaGFu Z2VkKCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7CisgICAgY29ubmVjdChtX2NvbnRlbnQsIFNJ R05BTChoZWlnaHRDaGFuZ2VkKCkpLCB0aGlzLCBTTE9UKGNvbnRlbnRWaWV3cG9ydENoYW5nZWQo KSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAgICBjb25uZWN0KG1fY29udGVudCwgU0lHTkFM KHNjYWxlQ2hhbmdlZCgpKSwgdGhpcywgU0xPVChjb250ZW50Vmlld3BvcnRDaGFuZ2VkKCkpLCBR dDo6RGlyZWN0Q29ubmVjdGlvbik7Cit9CisKK1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6On5W aWV3cG9ydEludGVyYWN0aW9uRW5naW5lKCkKK3sKIH0KIAogdm9pZCBWaWV3cG9ydEludGVyYWN0 aW9uRW5naW5lOjpyZXNldCgpCkBAIC0xMTEsMTQgKzExOSw5IEBAIHZvaWQgVmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZTo6c2V0Q29uc3RyYWludHMoY29uc3QgQ29uc3RyYWludHMmIGNvbnN0cmFp bnRzKQogICAgIC8vIC1hbmltYXRlIHRoZSBwYWdlIGJhY2sgaW4gdmlld3BvcnQgaWYgbmVjZXNz YXJ5IChpZiB0aGUgcGFnZSBpcyBmdWxseSBpbgogICAgIC8vICB2aWV3cG9ydCwgaXQgZG9lcyBu b3QgcGFuIGhvcml6b250YWxseSBhbnltb3JlKS4KIAotICAgIGNvbnN0IHFyZWFsIHByZXZpb3Vz U2NhbGUgPSBtX2NvbnRlbnQtPnNjYWxlKCk7Ci0gICAgewotICAgICAgICBWaWV3cG9ydFVwZGF0 ZUd1YXJkIGd1YXJkKHRoaXMpOwotICAgICAgICBtX2NvbnN0cmFpbnRzID0gY29uc3RyYWludHM7 Ci0gICAgICAgIHVwZGF0ZUNvbnRlbnRJZk5lZWRlZCgpOwotICAgIH0KLSAgICBpZiAobV9jb250 ZW50LT5zY2FsZSgpICE9IHByZXZpb3VzU2NhbGUpCi0gICAgICAgIGVtaXQgY29tbWl0U2NhbGVD aGFuZ2UoKTsKKyAgICBWaWV3cG9ydFVwZGF0ZUd1YXJkIGd1YXJkKHRoaXMpOworICAgIG1fY29u c3RyYWludHMgPSBjb25zdHJhaW50czsKKyAgICB1cGRhdGVDb250ZW50SWZOZWVkZWQoKTsKIH0K IAogdm9pZCBWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwYW5HZXN0dXJlU3RhcnRlZCgpCkBA IC0xNTYsNiArMTU5LDggQEAgdm9pZCBWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdl c3R1cmVTdGFydGVkKCkKICAgICBpZiAoIW1fY29uc3RyYWludHMuaXNVc2VyU2NhbGFibGUpCiAg ICAgICAgIHJldHVybjsKIAorICAgIG1fcGluY2hWaWV3cG9ydFVwZGF0ZURlZmVycmVyID0gYWRv cHRQdHIobmV3IFZpZXdwb3J0VXBkYXRlR3VhcmQodGhpcykpOworCiAgICAgbV91c2VySW50ZXJh Y3Rpb25GbGFncyB8PSBVc2VySGFzU2NhbGVkQ29udGVudDsKICAgICBtX3VzZXJJbnRlcmFjdGlv bkZsYWdzIHw9IFVzZXJIYXNNb3ZlZENvbnRlbnQ7CiAgICAgbV9waW5jaFN0YXJ0U2NhbGUgPSBt X2NvbnRlbnQtPnNjYWxlKCk7CkBAIC0xODcsMjMgKzE5MiwxMCBAQCB2b2lkIFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZUVuZGVkKCkKICAgICAgICAgLy8gRklYTUU6IHJl c3VtZSB0aGUgZW5naW5lIGFmdGVyIHRoZSBhbmltYXRpb24uCiAgICAgICAgIGFuaW1hdGVDb250 ZW50SW50b0JvdW5kYXJpZXNJZk5lZWRlZCgpOwogICAgIH0KLSAgICBpZiAobV9waW5jaFN0YXJ0 U2NhbGUgIT0gbV9jb250ZW50LT5zY2FsZSgpKQotICAgICAgICBlbWl0IGNvbW1pdFNjYWxlQ2hh bmdlKCk7Ci19Ci0KLXZvaWQgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y29udGVudEdlb21l dHJ5Q2hhbmdlZCgpCi17Ci0gICAgaWYgKG1faXNVcGRhdGluZ0NvbnRlbnQpCi0gICAgICAgIHJl dHVybjsKLQotICAgIFZpZXdwb3J0VXBkYXRlR3VhcmQgZ3VhcmQodGhpcyk7Ci0gICAgdXBkYXRl Q29udGVudElmTmVlZGVkKCk7Ci0KLSAgICAvLyBXZSBtdXN0IG5vdGlmeSB0aGUgY2hhbmdlIHNv IHRoZSBjbGllbnQgY2FuIHJlbHkgb24gdXMgZm9yIGFsbCBjaGFuZ2Ugb2YgR2VvbWV0cnkuCi0g ICAgZW1pdCB2aWV3cG9ydFVwZGF0ZVJlcXVlc3RlZCgpOworICAgIG1fcGluY2hWaWV3cG9ydFVw ZGF0ZURlZmVycmVyLmNsZWFyKCk7CiB9CiAKLXZvaWQgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6Y29udGVudFNjYWxlQ2hhbmdlZCgpCit2b2lkIFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 OmNvbnRlbnRWaWV3cG9ydENoYW5nZWQoKQogewogICAgIGlmIChtX2lzVXBkYXRpbmdDb250ZW50 KQogICAgICAgICByZXR1cm47CkBAIC0yMTMsNyArMjA1LDYgQEAgdm9pZCBWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lOjpjb250ZW50U2NhbGVDaGFuZ2VkKCkKIAogICAgIC8vIFdlIG11c3Qgbm90 aWZ5IHRoZSBjaGFuZ2Ugc28gdGhlIGNsaWVudCBjYW4gcmVseSBvbiB1cyBmb3IgYWxsIGNoYW5n ZSBvZiBHZW9tZXRyeS4KICAgICBlbWl0IHZpZXdwb3J0VXBkYXRlUmVxdWVzdGVkKCk7Ci0gICAg ZW1pdCBjb21taXRTY2FsZUNoYW5nZSgpOwogfQogCiB2b2lkIFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6OnVwZGF0ZUNvbnRlbnRJZk5lZWRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvcXQvVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCAyZjgyYjhl Njk2ODI0OTFmNWMxYTkwNDljMTZmMTA5NWE3OWI3MjljLi5hZTI3N2RlNDBjYzVmMzA1OTBjMWQ1 NDcyMGYzOGYyMTM0MDI1NWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9WaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKQEAgLTIxLDYgKzIxLDcgQEAKICNp Zm5kZWYgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZV9oCiAjZGVmaW5lIFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmVfaAogCisjaW5jbHVkZSAiT3duUHRyLmgiCiAjaW5jbHVkZSAicXdlYmtpdGds b2JhbC5oIgogI2luY2x1ZGUgPFF0Q29yZS9RT2JqZWN0PgogCkBAIC0zMSwxMSArMzIsMTQgQEAg UVRfRU5EX05BTUVTUEFDRQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgVmlld3BvcnRV cGRhdGVHdWFyZDsKKwogY2xhc3MgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSA6IHB1YmxpYyBR T2JqZWN0IHsKICAgICBRX09CSkVDVAogCiBwdWJsaWM6CiAgICAgVmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZShjb25zdCBRU0dJdGVtKiwgUVNHSXRlbSopOworICAgIH5WaWV3cG9ydEludGVyYWN0 aW9uRW5naW5lKCk7CiAKICAgICBzdHJ1Y3QgQ29uc3RyYWludHMgewogICAgICAgICBDb25zdHJh aW50cygpCkBAIC02NiwxMiArNzAsOSBAQCBwdWJsaWM6CiBRX1NJR05BTFM6CiAgICAgdm9pZCB2 aWV3cG9ydFVwZGF0ZVJlcXVlc3RlZCgpOwogCi0gICAgdm9pZCBjb21taXRTY2FsZUNoYW5nZSgp OwotCiBwcml2YXRlIFFfU0xPVFM6CiAgICAgLy8gUmVzcG9uZCB0byBjaGFuZ2VzIG9mIGNvbnRl bnQgdGhhdCBhcmUgbm90IGRyaXZlbiBieSB1cywgbGlrZSB0aGUgcGFnZSByZXNpemluZyBpdHNl bGYuCi0gICAgdm9pZCBjb250ZW50R2VvbWV0cnlDaGFuZ2VkKCk7Ci0gICAgdm9pZCBjb250ZW50 U2NhbGVDaGFuZ2VkKCk7CisgICAgdm9pZCBjb250ZW50Vmlld3BvcnRDaGFuZ2VkKCk7CiAKIHBy aXZhdGU6CiAgICAgdm9pZCB1cGRhdGVDb250ZW50SWZOZWVkZWQoKTsKQEAgLTkxLDYgKzkyLDcg QEAgcHJpdmF0ZToKIAogICAgIENvbnN0cmFpbnRzIG1fY29uc3RyYWludHM7CiAgICAgYm9vbCBt X2lzVXBkYXRpbmdDb250ZW50OworICAgIE93blB0cjxWaWV3cG9ydFVwZGF0ZUd1YXJkPiBtX3Bp bmNoVmlld3BvcnRVcGRhdGVEZWZlcnJlcjsKICAgICBlbnVtIFVzZXJJbnRlcmFjdGlvbkZsYWcg ewogICAgICAgICBVc2VySGFzTm90SW50ZXJhY3RlZFdpdGhDb250ZW50ID0gMCwKICAgICAgICAg VXNlckhhc01vdmVkQ29udGVudCA9IDEsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvcXRvdWNod2VicGFnZXByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuY3BwCmluZGV4IDVlN2JlNWZjMmRmNWQxNWY0ZTZjNWQ4 ZTRiNjlkZDUxZGU3NDdlYzIuLmRhODRkYjBmNDZjZDYxMjU0YTA4MzQ0OWQ5N2VhNDEyYzI3OTlj Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdl cHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdl cHJveHkuY3BwCkBAIC03NywxMSArNzcsMTAgQEAgYm9vbCBRVG91Y2hXZWJQYWdlUHJveHk6Omhh bmRsZUV2ZW50KFFFdmVudCogZXYpCiAgICAgcmV0dXJuIFF0V2ViUGFnZVByb3h5OjpoYW5kbGVF dmVudChldik7CiB9CiAKLXZvaWQgUVRvdWNoV2ViUGFnZVByb3h5OjpzZXRWaXNpYmxlQ29udGVu dFJlY3QoY29uc3QgUVJlY3RGJiB2aXNpYmxlQ29udGVudFJlY3QpCit2b2lkIFFUb3VjaFdlYlBh Z2VQcm94eTo6c2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUoY29uc3QgUVJlY3RGJiB2aXNp YmxlQ29udGVudFJlY3QsIGZsb2F0IHNjYWxlKQogewotICAgIFRpbGVkRHJhd2luZ0FyZWFQcm94 eSogdGlsZWREcmF3aW5nQXJlYSA9IHN0YXRpY19jYXN0PFRpbGVkRHJhd2luZ0FyZWFQcm94eSo+ KG1fd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpKTsKICAgICBRUmVjdCBhbGlnbmVkVmlzaWJs ZUNvbnRlbnRSZWN0ID0gdmlzaWJsZUNvbnRlbnRSZWN0LnRvQWxpZ25lZFJlY3QoKTsKLSAgICB0 aWxlZERyYXdpbmdBcmVhLT5zZXRWaXNpYmxlQ29udGVudFJlY3QoYWxpZ25lZFZpc2libGVDb250 ZW50UmVjdCk7CisgICAgZHJhd2luZ0FyZWEoKS0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2Nh bGUoYWxpZ25lZFZpc2libGVDb250ZW50UmVjdCwgc2NhbGUpOwogCiAgICAgLy8gRklYTUU6IE9u Y2Ugd2Ugc3VwcG9ydCBzdXNwZW5kIGFuZCByZXN1bWUsIHRoaXMgc2hvdWxkIGJlIGRlbGF5ZWQg dW50aWwgdGhlIHBhZ2UgaXMgYWN0aXZlIGlmIHRoZSBwYWdlIGlzIHN1c3BlbmRlZC4KICAgICBt X3dlYlBhZ2VQcm94eS0+c2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3QoYWxpZ25lZFZpc2libGVD b250ZW50UmVjdCk7CkBAIC0xMDgsMTEgKzEwNyw2IEBAIHZvaWQgUVRvdWNoV2ViUGFnZVByb3h5 OjpmaW5kWm9vbWFibGVBcmVhRm9yUG9pbnQoY29uc3QgUVBvaW50JiBwb2ludCkKICAgICBtX3dl YlBhZ2VQcm94eS0+ZmluZFpvb21hYmxlQXJlYUZvclBvaW50KHBvaW50KTsKIH0KIAotdm9pZCBR VG91Y2hXZWJQYWdlUHJveHk6OnNldENvbnRlbnRzU2NhbGUocXJlYWwgc2NhbGUpCi17Ci0gICAg ZHJhd2luZ0FyZWEoKS0+c2V0Q29udGVudHNTY2FsZShzY2FsZSk7Ci19Ci0KIHZvaWQgUVRvdWNo V2ViUGFnZVByb3h5OjpyZW5kZXJOZXh0RnJhbWUoKQogewogICAgIGRyYXdpbmdBcmVhKCktPnJl bmRlck5leHRGcmFtZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L3F0b3VjaHdlYnBhZ2Vwcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3F0b3Vj aHdlYnBhZ2Vwcm94eS5oCmluZGV4IDk5MmYwMGFlNWE0ZmMwODE4ZTZkYmYxZjFmZjUzYjFmZjhh NjBkNmIuLjc4MzFkYmZiZWYzYjMwYTk4N2JkMjllNmYzMmU2OGY5ZDc4NDgzNTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvcXRvdWNod2VicGFnZXByb3h5LmgKQEAgLTQz LDEwICs0Myw5IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVFdmVudChRRXZl bnQqKTsKIAotICAgIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRSZWN0KGNvbnN0IFFSZWN0RiYpOwor ICAgIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUoY29uc3QgUVJlY3RGJiwgZmxv YXQpOwogICAgIHZvaWQgc2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoY29uc3Qg UVNpemUmIHRhcmdldExheW91dFNpemUpOwogICAgIHZvaWQgZmluZFpvb21hYmxlQXJlYUZvclBv aW50KGNvbnN0IFFQb2ludCYpOwotICAgIHZvaWQgc2V0Q29udGVudHNTY2FsZShxcmVhbCk7CiAg ICAgdm9pZCByZW5kZXJOZXh0RnJhbWUoKTsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAppbmRleCBhZDFjMTc1MTk3NWZm YjdiNTExZGQzNDY5MTQ0NTgzMjQ2YWUyNGY1Li40YTg1MjExMjg2ZWYyMGRlNWUyNTc1OWUxMGE4 YjA3NGY3NTQ4MDBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RHJhd2luZ0FyZWEuaApAQCAtOTksNyArOTksNyBAQCBwcml2YXRlOgogCiAjaWYgRU5BQkxFKFRJ TEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgdmlydHVhbCB2b2lkIHNldFNpemUoY29uc3QgV2ViQ29y ZTo6SW50U2l6ZSYgdmlld1NpemUpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBzZXRWaXNpYmxlQ29u dGVudFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBz ZXRWaXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgZmxv YXQpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c1NjYWxlKGZsb2F0IHNjYWxlKSB7 IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVuZGVyTmV4dEZyYW1lKCkgeyB9CiAgICAgdmlydHVhbCB2 b2lkIHRha2VTbmFwc2hvdChjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB0YXJnZXRTaXplLCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiBjb250ZW50c1JlY3QpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLm1lc3NhZ2VzLmluIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLm1lc3NhZ2VzLmluCmlu ZGV4IDk1M2QzNTllOWFmMjJmOTkzNDAwMWJmMmQyZDNjOWFiM2FkNzc3NjMuLjM2MzU2YWQwM2Vi NDc1Y2M1ODk2YmFiNzJhYTc3ZTQwNzFmNDcxZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMuaW4KQEAgLTI4 LDggKzI4LDcgQEAgbWVzc2FnZXMgLT4gRHJhd2luZ0FyZWEgewogCiAjaWYgRU5BQkxFKFRJTEVE X0JBQ0tJTkdfU1RPUkUpCiAgICAgU2V0U2l6ZShXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKQot ICAgIFNldFZpc2libGVDb250ZW50UmVjdChXZWJDb3JlOjpJbnRSZWN0IHZpc2libGVDb250ZW50 UmVjdCkKLSAgICBTZXRDb250ZW50c1NjYWxlKGZsb2F0IHNjYWxlKQorICAgIFNldFZpc2libGVD b250ZW50UmVjdEFuZFNjYWxlKFdlYkNvcmU6OkludFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0LCBm bG9hdCBzY2FsZSkKICAgICBSZW5kZXJOZXh0RnJhbWUoKQogICAgIFRha2VTbmFwc2hvdChXZWJD b3JlOjpJbnRTaXplIHNpemUsIFdlYkNvcmU6OkludFJlY3QgY29udGVudHNSZWN0KQogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3 aW5nQXJlYS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3 aW5nQXJlYS5jcHAKaW5kZXggODFkZmIyNTY1ZmJkODdjZjg0NWVkNzBmMzdjMWQ4MWY0NWVjYzI3 Ny4uYTU4ZTQ2MDlkMzA3ZTg5OTZkYzYwYTQwMTgxMmUzZWJkMjQwNTA5NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9UaWxlZERyYXdpbmdBcmVhLmNw cApAQCAtNzAsMTcgKzcwLDE2IEBAIHZvaWQgVGlsZWREcmF3aW5nQXJlYTo6c2V0U2l6ZShjb25z dCBJbnRTaXplJiB2aWV3U2l6ZSkKICAgICBtX3dlYlBhZ2UtPnNldFNpemUodmlld1NpemUpOwog fQogCi12b2lkIFRpbGVkRHJhd2luZ0FyZWE6OnNldFZpc2libGVDb250ZW50UmVjdChjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0KQordm9pZCBUaWxlZERyYXdpbmdB cmVhOjpzZXRWaXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSkKIHsKICAgICBtX3Zpc2libGVDb250 ZW50UmVjdCA9IHZpc2libGVDb250ZW50c1JlY3Q7Ci0gICAgbV9tYWluQmFja2luZ1N0b3JlLT5h ZGp1c3RWaXNpYmxlUmVjdCgpOwotfQogCi12b2lkIFRpbGVkRHJhd2luZ0FyZWE6OnNldENvbnRl bnRzU2NhbGUoZmxvYXQgc2NhbGUpCi17Ci0gICAgbV9wcmV2aW91c0JhY2tpbmdTdG9yZSA9IG1f bWFpbkJhY2tpbmdTdG9yZS5yZWxlYXNlKCk7Ci0gICAgbV9tYWluQmFja2luZ1N0b3JlID0gYWRv cHRQdHIobmV3IFRpbGVkQmFja2luZ1N0b3JlKHRoaXMsIFRpbGVkQmFja2luZ1N0b3JlUmVtb3Rl VGlsZUJhY2tlbmQ6OmNyZWF0ZSh0aGlzKSkpOwotICAgIG1fbWFpbkJhY2tpbmdTdG9yZS0+c2V0 Q29udGVudHNTY2FsZShzY2FsZSk7CisgICAgaWYgKHNjYWxlICE9IG1fbWFpbkJhY2tpbmdTdG9y ZS0+Y29udGVudHNTY2FsZSgpKSB7CisgICAgICAgIG1fcHJldmlvdXNCYWNraW5nU3RvcmUgPSBt X21haW5CYWNraW5nU3RvcmUucmVsZWFzZSgpOworICAgICAgICBtX21haW5CYWNraW5nU3RvcmUg PSBhZG9wdFB0cihuZXcgVGlsZWRCYWNraW5nU3RvcmUodGhpcywgVGlsZWRCYWNraW5nU3RvcmVS ZW1vdGVUaWxlQmFja2VuZDo6Y3JlYXRlKHRoaXMpKSk7CisgICAgICAgIG1fbWFpbkJhY2tpbmdT dG9yZS0+c2V0Q29udGVudHNTY2FsZShzY2FsZSk7CisgICAgfSBlbHNlCisgICAgICAgIG1fbWFp bkJhY2tpbmdTdG9yZS0+YWRqdXN0VmlzaWJsZVJlY3QoKTsKIH0KIAogdm9pZCBUaWxlZERyYXdp bmdBcmVhOjpyZW5kZXJOZXh0RnJhbWUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9UaWxlZERyYXdpbmdBcmVhLmgKaW5kZXggMzE3OTJjZGE4YjY0NTMzMDI4 YjUxOTk0Yzk4MjZiNGVkNWM5Y2NjZC4uMzA5YjJhMTBhY2ZkODI0ODFiNDQxZDFiZTUwYzMzNDhk Nzc2MTgxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1Rp bGVkRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv VGlsZWREcmF3aW5nQXJlYS5oCkBAIC01NCw4ICs1NCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg ICAgLy8gQ29yZUlQQyBtZXNzYWdlIGhhbmRsZXJzLgogICAgIHZpcnR1YWwgdm9pZCBzZXRTaXpl KGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0 VmlzaWJsZUNvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKLSAgICB2aXJ0dWFs IHZvaWQgc2V0Q29udGVudHNTY2FsZShmbG9hdCk7CisgICAgdmlydHVhbCB2b2lkIHNldFZpc2li bGVDb250ZW50UmVjdEFuZFNjYWxlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBmbG9hdCk7CiAg ICAgdmlydHVhbCB2b2lkIHJlbmRlck5leHRGcmFtZSgpOwogICAgIHZpcnR1YWwgdm9pZCBzdXNw ZW5kUGFpbnRpbmcoKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVzdW1lUGFpbnRpbmcoKTsK