61352 2011-05-24 02:42:17 -0700 Refactor RenderView::{enable,disable}LayoutState call sites to use RIIA 2011-05-25 00:17:39 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 47815 1 yuzo yuzo commit-queue oldest_to_newest 408744 0 yuzo 2011-05-24 02:42:17 -0700 The following pattern appears 10 times or so in the codebase. view->disableLayoutState(); ... view->enableLayoutState(); It should be replaced with RIIA, that is: { LayoutStateDisabler layoutStateDisabler(view); ... } 408755 1 94588 yuzo 2011-05-24 03:24:07 -0700 Created attachment 94588 Patch 409335 2 94588 tkent 2011-05-24 17:28:31 -0700 Comment on attachment 94588 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94588&action=review looks good. > Source/WebCore/page/FrameView.cpp:987 > + if (subtree) { > + RenderView* view = root->view(); > + view->popLayoutState(root); > + } nit: The variable 'view' is not needed. if (subtree) root->view()->popLayoutState(root); 409402 3 94733 yuzo 2011-05-24 20:33:14 -0700 Created attachment 94733 Addressed nit 409498 4 94733 commit-queue 2011-05-25 00:17:34 -0700 Comment on attachment 94733 Addressed nit Clearing flags on attachment: 94733 Committed r87277: <http://trac.webkit.org/changeset/87277> 409499 5 commit-queue 2011-05-25 00:17:39 -0700 All reviewed patches have been landed. Closing bug. 94588 2011-05-24 03:24:07 -0700 2011-05-24 20:33:08 -0700 Patch bug-61352-20110524032405.patch text/plain 15330 yuzo U3VidmVyc2lvbiBSZXZpc2lvbjogODcxMjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5Y2QxODIyYjA4ZDJjOThk Y2Y0YzNmZjBjYTRmNWZjNzQ1NGJkZjY4Li42NDY4MTI5ZGI2YWU0YTc1NDZlNDViYjk3NTBhYjZk YTY5ZTlkODMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDUtMjQgIFl1em8g RnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgQnVnIDYxMzUyIC0gUmVmYWN0b3IgUmVuZGVy Vmlldzo6e2VuYWJsZSxkaXNhYmxlfUxheW91dFN0YXRlIGNhbGwgc2l0ZXMgdG8gdXNlIFJJSUEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMzUyCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAg ICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlck1lZGlhVm9sdW1lU2xpZGVyQ29udGFpbmVyOjpsYXlvdXQpOgorICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5 b3V0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6dXBkYXRlRmlyc3RMZXR0ZXIpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBk YXRlTGF5ZXJQb3NpdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0 ZVNjcm9sbEluZm9BZnRlckxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6bGF5b3V0KToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGlzdEl0ZW06OnVwZGF0ZU1hcmtlckxvY2F0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTWVkaWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVkaWE6OmxheW91dCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclZpZXc6OmRpc2FibGVMYXlvdXRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJW aWV3OjplbmFibGVMYXlvdXRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZURp c2FibGVyOjpMYXlvdXRTdGF0ZURpc2FibGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0 YXRlRGlzYWJsZXI6On5MYXlvdXRTdGF0ZURpc2FibGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcv c3ZnL1JlbmRlclNWR1Jvb3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUm9vdDo6 bGF5b3V0KToKKwogMjAxMS0wNS0xOSAgTU9SSVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKaW5kZXggOGMy MTZkZWQyODFiODdmYzhiNzVjNDkxNzkwZjJiY2MzMTM4ODU1Ny4uNTRhNDUzOTI1NTg1NzM3Mjky ODY0NTk5MWJiYmMxOGUzNWU4NDM0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv c2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcApAQCAtMTY3LDE1ICsxNjcsMTEgQEAgdm9p ZCBSZW5kZXJNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lcjo6bGF5b3V0KCkKIAogICAgIFJlbmRl ckJveCogYnV0dG9uQm94ID0gdG9SZW5kZXJCb3gocHJldmlvdXNTaWJsaW5nKCkpOwogCi0gICAg aWYgKHZpZXcoKSkKLSAgICAgICAgdmlldygpLT5kaXNhYmxlTGF5b3V0U3RhdGUoKTsKKyAgICBM YXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKIAogICAgIElu dFBvaW50IG9mZnNldCA9IHRoZW1lKCktPnZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRlQnV0dG9u KGJ1dHRvbkJveCwgSW50U2l6ZSh3aWR0aCgpLCBoZWlnaHQoKSkpOwogICAgIHNldFgob2Zmc2V0 LngoKSArIGJ1dHRvbkJveC0+b2Zmc2V0TGVmdCgpKTsKICAgICBzZXRZKG9mZnNldC55KCkgKyBi dXR0b25Cb3gtPm9mZnNldFRvcCgpKTsKLQotICAgIGlmICh2aWV3KCkpCi0gICAgICAgIHZpZXco KS0+ZW5hYmxlTGF5b3V0U3RhdGUoKTsKIH0KIAogaW5saW5lIE1lZGlhQ29udHJvbFZvbHVtZVNs aWRlckNvbnRhaW5lckVsZW1lbnQ6Ok1lZGlhQ29udHJvbFZvbHVtZVNsaWRlckNvbnRhaW5lckVs ZW1lbnQoSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuY3BwCmluZGV4IGFjN2EyM2MyN2I1YTZlYTIwODE3YTI1MTA5NmRiMDViMjk1ZGE5MGEuLmU5 NWVkOTA3ZGVjZmNkZDA0OWEzYTI2M2M3NTdjMzIyMjU1OGMwMWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKQEAgLTk2NiwyNiArOTY2LDI1IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQo Ym9vbCBhbGxvd1N1YnRyZWUpCiAKICAgICBtX2FjdGlvblNjaGVkdWxlci0+cGF1c2UoKTsKIAot ICAgIGJvb2wgZGlzYWJsZUxheW91dFN0YXRlID0gZmFsc2U7Ci0gICAgaWYgKHN1YnRyZWUpIHsK LSAgICAgICAgUmVuZGVyVmlldyogdmlldyA9IHJvb3QtPnZpZXcoKTsKLSAgICAgICAgZGlzYWJs ZUxheW91dFN0YXRlID0gdmlldy0+c2hvdWxkRGlzYWJsZUxheW91dFN0YXRlRm9yU3VidHJlZShy b290KTsKLSAgICAgICAgdmlldy0+cHVzaExheW91dFN0YXRlKHJvb3QpOwotICAgICAgICBpZiAo ZGlzYWJsZUxheW91dFN0YXRlKQotICAgICAgICAgICAgdmlldy0+ZGlzYWJsZUxheW91dFN0YXRl KCk7Ci0gICAgfQotICAgICAgICAKLSAgICBtX2luTGF5b3V0ID0gdHJ1ZTsKLSAgICBiZWdpbkRl ZmVycmVkUmVwYWludHMoKTsKLSAgICByb290LT5sYXlvdXQoKTsKLSAgICBlbmREZWZlcnJlZFJl cGFpbnRzKCk7Ci0gICAgbV9pbkxheW91dCA9IGZhbHNlOworICAgIHsKKyAgICAgICAgYm9vbCBk aXNhYmxlTGF5b3V0U3RhdGUgPSBmYWxzZTsKKyAgICAgICAgaWYgKHN1YnRyZWUpIHsKKyAgICAg ICAgICAgIFJlbmRlclZpZXcqIHZpZXcgPSByb290LT52aWV3KCk7CisgICAgICAgICAgICBkaXNh YmxlTGF5b3V0U3RhdGUgPSB2aWV3LT5zaG91bGREaXNhYmxlTGF5b3V0U3RhdGVGb3JTdWJ0cmVl KHJvb3QpOworICAgICAgICAgICAgdmlldy0+cHVzaExheW91dFN0YXRlKHJvb3QpOworICAgICAg ICB9CisgICAgICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcihkaXNh YmxlTGF5b3V0U3RhdGUgPyByb290LT52aWV3KCkgOiAwKTsKIAotICAgIGlmIChzdWJ0cmVlKSB7 Ci0gICAgICAgIFJlbmRlclZpZXcqIHZpZXcgPSByb290LT52aWV3KCk7Ci0gICAgICAgIHZpZXct PnBvcExheW91dFN0YXRlKHJvb3QpOwotICAgICAgICBpZiAoZGlzYWJsZUxheW91dFN0YXRlKQot ICAgICAgICAgICAgdmlldy0+ZW5hYmxlTGF5b3V0U3RhdGUoKTsKKyAgICAgICAgbV9pbkxheW91 dCA9IHRydWU7CisgICAgICAgIGJlZ2luRGVmZXJyZWRSZXBhaW50cygpOworICAgICAgICByb290 LT5sYXlvdXQoKTsKKyAgICAgICAgZW5kRGVmZXJyZWRSZXBhaW50cygpOworICAgICAgICBtX2lu TGF5b3V0ID0gZmFsc2U7CisKKyAgICAgICAgaWYgKHN1YnRyZWUpIHsKKyAgICAgICAgICAgIFJl bmRlclZpZXcqIHZpZXcgPSByb290LT52aWV3KCk7CisgICAgICAgICAgICB2aWV3LT5wb3BMYXlv dXRTdGF0ZShyb290KTsKKyAgICAgICAgfQogICAgIH0KICAgICBtX2xheW91dFJvb3QgPSAwOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCA0YTg3ZjNiMjhm OTZiMTBhM2RiMTg0OTY0NTExYTk2ZGFjNWEyNTdmLi5kYzViZWI3YzFkODkwN2I2MjYwMzA2N2Uw NWM1M2EzOGFlYjc3ODcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAKQEAgLTIyMjUsNyArMjIyNSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnJlcGFpbnRPdmVyaGFu Z2luZ0Zsb2F0cyhib29sIHBhaW50QWxsRGVzY2VuZGFudHMpCiAKICAgICAvLyBGSVhNRTogQXZv aWQgZGlzYWJsaW5nIExheW91dFN0YXRlLiBBdCB0aGUgdmVyeSBsZWFzdCwgZG9uJ3QgZGlzYWJs ZSBpdCBmb3IgZmxvYXRzIG9yaWdpbmF0aW5nCiAgICAgLy8gaW4gdGhpcyBibG9jay4gQmV0dGVy IHlldCB3b3VsZCBiZSB0byBwdXNoIGV4dHJhIHN0YXRlIGZvciB0aGUgY29udGFpbmVycyBvZiBv dGhlciBmbG9hdHMuCi0gICAgdmlldygpLT5kaXNhYmxlTGF5b3V0U3RhdGUoKTsKKyAgICBMYXlv dXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKICAgICBGbG9hdGlu Z09iamVjdFNldCYgZmxvYXRpbmdPYmplY3RTZXQgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+c2V0KCk7 CiAgICAgRmxvYXRpbmdPYmplY3RTZXRJdGVyYXRvciBlbmQgPSBmbG9hdGluZ09iamVjdFNldC5l bmQoKTsKICAgICBmb3IgKEZsb2F0aW5nT2JqZWN0U2V0SXRlcmF0b3IgaXQgPSBmbG9hdGluZ09i amVjdFNldC5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKQEAgLTIyMzgsNyArMjIzOCw2IEBA IHZvaWQgUmVuZGVyQmxvY2s6OnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyhib29sIHBhaW50QWxs RGVzY2VuZGFudHMpCiAgICAgICAgICAgICByLT5tX3JlbmRlcmVyLT5yZXBhaW50T3Zlcmhhbmdp bmdGbG9hdHMoKTsKICAgICAgICAgfQogICAgIH0KLSAgICB2aWV3KCktPmVuYWJsZUxheW91dFN0 YXRlKCk7CiB9CiAgCiB2b2lkIFJlbmRlckJsb2NrOjpwYWludChQYWludEluZm8mIHBhaW50SW5m bywgaW50IHR4LCBpbnQgdHkpCkBAIC01MzUxLDE0ICs1MzUwLDE0IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OnVwZGF0ZUZpcnN0TGV0dGVyKCkKICAgICAgICAgICAgIG5ld0ZpcnN0TGV0dGVyLT5zZXRT dHlsZShwc2V1ZG9TdHlsZSk7CiAKICAgICAgICAgICAgIC8vIE1vdmUgdGhlIGZpcnN0IGxldHRl ciBpbnRvIHRoZSBuZXcgcmVuZGVyZXIuCi0gICAgICAgICAgICB2aWV3KCktPmRpc2FibGVMYXlv dXRTdGF0ZSgpOworICAgICAgICAgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURp c2FibGVyKHZpZXcoKSk7CiAgICAgICAgICAgICB3aGlsZSAoUmVuZGVyT2JqZWN0KiBjaGlsZCA9 IGZpcnN0TGV0dGVyLT5maXJzdENoaWxkKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoY2hpbGQt PmlzVGV4dCgpKQogICAgICAgICAgICAgICAgICAgICB0b1JlbmRlclRleHQoY2hpbGQpLT5yZW1v dmVBbmREZXN0cm95VGV4dEJveGVzKCk7CiAgICAgICAgICAgICAgICAgZmlyc3RMZXR0ZXItPnJl bW92ZUNoaWxkKGNoaWxkKTsKICAgICAgICAgICAgICAgICBuZXdGaXJzdExldHRlci0+YWRkQ2hp bGQoY2hpbGQsIDApOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgCisKICAgICAgICAgICAg IFJlbmRlclRleHRGcmFnbWVudCogcmVtYWluaW5nVGV4dCA9IDA7CiAgICAgICAgICAgICBSZW5k ZXJPYmplY3QqIG5leHRTaWJsaW5nID0gZmlyc3RMZXR0ZXItPm5leHRTaWJsaW5nKCk7CiAgICAg ICAgICAgICBSZW5kZXJPYmplY3QqIG5leHQgPSBuZXh0U2libGluZzsKQEAgLTUzNzcsNyArNTM3 Niw2IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZUZpcnN0TGV0dGVyKCkKICAgICAgICAgICAg IGZpcnN0TGV0dGVyLT5kZXN0cm95KCk7CiAgICAgICAgICAgICBmaXJzdExldHRlciA9IG5ld0Zp cnN0TGV0dGVyOwogICAgICAgICAgICAgZmlyc3RMZXR0ZXJDb250YWluZXItPmFkZENoaWxkKGZp cnN0TGV0dGVyLCBuZXh0U2libGluZyk7Ci0gICAgICAgICAgICB2aWV3KCktPmVuYWJsZUxheW91 dFN0YXRlKCk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgZmlyc3RMZXR0ZXItPnNldFN0 eWxlKHBzZXVkb1N0eWxlKTsKIApAQCAtNTM5Nyw3ICs1Mzk1LDcgQEAgdm9pZCBSZW5kZXJCbG9j azo6dXBkYXRlRmlyc3RMZXR0ZXIoKQogCiAgICAgLy8gT3VyIGxheW91dCBzdGF0ZSBpcyBub3Qg dmFsaWQgZm9yIHRoZSByZXBhaW50cyB3ZSBhcmUgZ29pbmcgdG8gdHJpZ2dlciBieQogICAgIC8v IGFkZGluZyBhbmQgcmVtb3ZpbmcgY2hpbGRyZW4gb2YgZmlyc3RMZXR0ZXJDb250YWluZXIuCi0g ICAgdmlldygpLT5kaXNhYmxlTGF5b3V0U3RhdGUoKTsKKyAgICBMYXlvdXRTdGF0ZURpc2FibGVy IGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKIAogICAgIFJlbmRlclRleHQqIHRleHRPYmog PSB0b1JlbmRlclRleHQoY3VyckNoaWxkKTsKIApAQCAtNTQ2MCw3ICs1NDU4LDYgQEAgdm9pZCBS ZW5kZXJCbG9jazo6dXBkYXRlRmlyc3RMZXR0ZXIoKQogCiAgICAgICAgIHRleHRPYmotPmRlc3Ry b3koKTsKICAgICB9Ci0gICAgdmlldygpLT5lbmFibGVMYXlvdXRTdGF0ZSgpOwogfQogCiAvLyBI ZWxwZXIgbWV0aG9kcyBmb3Igb2J0YWluaW5nIHRoZSBsYXN0IGxpbmUsIGNvbXB1dGluZyBsaW5l IGNvdW50cyBhbmQgaGVpZ2h0cyBmb3IgbGluZSBjb3VudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGM5Mzc2MDQ2MjNlMTkwMGI4OGQ5MjYyMjU5ZmI3OWZj NDJkN2EzMjYuLjNkZTM0NTEyMDlhNGJmYTRkMDk0ODVmMDdkNjcwMjk1NGM1OWUwOTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMzA5LDcgKzMwOSw3IEBA IHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zKFVwZGF0ZUxheWVyUG9zaXRp b25zRmxhZ3MgZmxhZ3MsIEludFBvaW50CiAgICAgaWYgKG1faGFzVmlzaWJsZUNvbnRlbnQpIHsK ICAgICAgICAgUmVuZGVyVmlldyogdmlldyA9IHJlbmRlcmVyKCktPnZpZXcoKTsKICAgICAgICAg QVNTRVJUKHZpZXcpOwotICAgICAgICAvLyBGSVhNRTogT3B0aW1pemUgdXNpbmcgTGF5b3V0U3Rh dGUgYW5kIHJlbW92ZSB0aGUgZGlzYWJsZUxheW91dFN0YXRlKCkgY2FsbAorICAgICAgICAvLyBG SVhNRTogT3B0aW1pemUgdXNpbmcgTGF5b3V0U3RhdGUgYW5kIHJlbW92ZSBMYXlvdXRTdGF0ZURp c2FibGVyIGluc3RhbnRpYXRpb24KICAgICAgICAgLy8gZnJvbSB1cGRhdGVTY3JvbGxJbmZvQWZ0 ZXJMYXlvdXQoKS4KICAgICAgICAgQVNTRVJUKCF2aWV3LT5sYXlvdXRTdGF0ZUVuYWJsZWQoKSk7 CiAKQEAgLTIxODEsMTIgKzIxODEsOSBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVTY3JvbGxJ bmZvQWZ0ZXJMYXlvdXQoKQogICAgICAgICAgICAgQVNTRVJUKHZpZXcpOwogICAgICAgICAgICAg Ly8gc2Nyb2xsVG9PZmZzZXQoKSBtYXkgY2FsbCB1cGRhdGVMYXllclBvc2l0aW9ucygpLCB3aGlj aCBkb2Vzbid0IHdvcmsKICAgICAgICAgICAgIC8vIHdpdGggTGF5b3V0U3RhdGUuCi0gICAgICAg ICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBkaXNhYmxlTGF5b3V0U3RhdGUvZW5hYmxlTGF5b3V0 U3RhdGUgaWYgdGhlIGFib3ZlIGNoYW5nZXMuCi0gICAgICAgICAgICBpZiAodmlldykKLSAgICAg ICAgICAgICAgICB2aWV3LT5kaXNhYmxlTGF5b3V0U3RhdGUoKTsKKyAgICAgICAgICAgIC8vIEZJ WE1FOiBSZW1vdmUgdGhlIExheW91dFN0YXRlRGlzYWJsZXIgaW5zdGFudGlhdGlvbiBpZiB0aGUg YWJvdmUgY2hhbmdlcy4KKyAgICAgICAgICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0U3Rh dGVEaXNhYmxlcih2aWV3KTsKICAgICAgICAgICAgIHNjcm9sbFRvT2Zmc2V0KG5ld1gsIG5ld1kp OwotICAgICAgICAgICAgaWYgKHZpZXcpCi0gICAgICAgICAgICAgICAgdmlldy0+ZW5hYmxlTGF5 b3V0U3RhdGUoKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMjI2MSwxMCArMjI1OCwxMSBAQCB2 b2lkIFJlbmRlckxheWVyOjp1cGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXQoKQogICAgIH0KICAK ICAgICBSZW5kZXJWaWV3KiB2aWV3ID0gcmVuZGVyZXIoKS0+dmlldygpOwotICAgIHZpZXctPmRp c2FibGVMYXlvdXRTdGF0ZSgpOwotICAgIHNjcm9sbFRvT2Zmc2V0KHNjcm9sbFhPZmZzZXQoKSwg c2Nyb2xsWU9mZnNldCgpKTsKLSAgICB2aWV3LT5lbmFibGVMYXlvdXRTdGF0ZSgpOwotIAorICAg IHsKKyAgICAgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcp OworICAgICAgICBzY3JvbGxUb09mZnNldChzY3JvbGxYT2Zmc2V0KCksIHNjcm9sbFlPZmZzZXQo KSk7CisgICAgfQorCiAgICAgaWYgKHJlbmRlcmVyKCktPm5vZGUoKSAmJiByZW5kZXJlcigpLT5k b2N1bWVudCgpLT5oYXNMaXN0ZW5lclR5cGUoRG9jdW1lbnQ6Ok9WRVJGTE9XQ0hBTkdFRF9MSVNU RU5FUikpCiAgICAgICAgIHVwZGF0ZU92ZXJmbG93U3RhdHVzKGhvcml6b250YWxPdmVyZmxvdywg dmVydGljYWxPdmVyZmxvdyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGlzdEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEJveC5jcHAKaW5kZXggYjc3OWJmNjRhMWEwYmE3NDg1YjZiZmM2ZjlmMjMxNzZkNTdlNmE4ZC4u ZTBlNjM2OWRkNWQ5ZjAxYWM3ODgzNDNlY2MyN2EzODU4NWQxMTYzMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcApAQCAtMTUxLDkgKzE1MSw4IEBAIHZvaWQg UmVuZGVyTGlzdEJveDo6bGF5b3V0KCkKIHsKICAgICBSZW5kZXJCbG9jazo6bGF5b3V0KCk7CiAg ICAgaWYgKG1fc2Nyb2xsVG9SZXZlYWxTZWxlY3Rpb25BZnRlckxheW91dCkgewotICAgICAgICB2 aWV3KCktPmRpc2FibGVMYXlvdXRTdGF0ZSgpOworICAgICAgICBMYXlvdXRTdGF0ZURpc2FibGVy IGxheW91dFN0YXRlRGlzYWJsZXIodmlldygpKTsKICAgICAgICAgc2Nyb2xsVG9SZXZlYWxTZWxl Y3Rpb24oKTsKLSAgICAgICAgdmlldygpLT5lbmFibGVMYXlvdXRTdGF0ZSgpOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKaW5kZXggZWFm NjhlNmM5MGI3YjE1OTc2MjgxYjM3ZjJlZGIzMGFkNzJjOWU2My4uZmNiOGIyYmEzZGY3NjhlZWUy OWMwZjZjNDRlMWM4MzIyNThmOWZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxpc3RJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGlzdEl0ZW0uY3BwCkBAIC0yMTMsNyArMjEzLDcgQEAgdm9pZCBSZW5kZXJMaXN0SXRlbTo6 dXBkYXRlTWFya2VyTG9jYXRpb24oKQogICAgICAgICBpZiAobWFya2VyUGFyICE9IGxpbmVCb3hQ YXJlbnQgfHwgbV9tYXJrZXItPnByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKSB7CiAgICAg ICAgICAgICAvLyBSZW1vdmluZyBhbmQgYWRkaW5nIHRoZSBtYXJrZXIgY2FuIHRyaWdnZXIgcmVw YWludGluZyBpbgogICAgICAgICAgICAgLy8gY29udGFpbmVycyBvdGhlciB0aGFuIG91cnNlbHZl cywgc28gd2UgbmVlZCB0byBkaXNhYmxlIExheW91dFN0YXRlLgotICAgICAgICAgICAgdmlldygp LT5kaXNhYmxlTGF5b3V0U3RhdGUoKTsKKyAgICAgICAgICAgIExheW91dFN0YXRlRGlzYWJsZXIg bGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAgICAgICAgICAgdXBkYXRlRmlyc3RMZXR0 ZXIoKTsKICAgICAgICAgICAgIG1fbWFya2VyLT5yZW1vdmUoKTsKICAgICAgICAgICAgIGlmICgh bGluZUJveFBhcmVudCkKQEAgLTIyMSw3ICsyMjEsNiBAQCB2b2lkIFJlbmRlckxpc3RJdGVtOjp1 cGRhdGVNYXJrZXJMb2NhdGlvbigpCiAgICAgICAgICAgICBsaW5lQm94UGFyZW50LT5hZGRDaGls ZChtX21hcmtlciwgZmlyc3ROb25NYXJrZXJDaGlsZChsaW5lQm94UGFyZW50KSk7CiAgICAgICAg ICAgICBpZiAobV9tYXJrZXItPnByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKQogICAgICAg ICAgICAgICAgIG1fbWFya2VyLT5jb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpOwotICAg ICAgICAgICAgdmlldygpLT5lbmFibGVMYXlvdXRTdGF0ZSgpOwogICAgICAgICB9CiAgICAgfQog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHAKaW5kZXggZTM2NmQ5ZTU0 ZTZlZmRlNjZiZmZmMWUwN2QyZjZiOThiMzU0ODkwYS4uZGM4ZDJkZDY2YTI0ZTkzMTkzMmQ0OGFk MDMyOWQ4ZjlhMmYwMzdiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck1lZGlhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEu Y3BwCkBAIC03MCw3ICs3MCw3IEBAIHZvaWQgUmVuZGVyTWVkaWE6OmxheW91dCgpCiAgICAgICAg IHJldHVybjsKIAogICAgIC8vIFdoZW4gY2FsbGluZyBsYXlvdXQoKSBvbiBhIGNoaWxkIG5vZGUs IGEgcGFyZW50IG11c3QgZWl0aGVyIHB1c2ggYSBMYXlvdXRTdGF0ZU1haW50YWludGVyLCBvciAK LSAgICAvLyBjYWxsIHZpZXcoKS0+ZGlzYWJsZUxheW91dFN0YXRlKCkuICBTaW5jZSB1c2luZyBh IExheW91dFN0YXRlTWFpbnRhaW5lciBpcyBzbGlnaHRseSBtb3JlIGVmZmljaWVudCwKKyAgICAv LyBpbnN0YW50aWF0ZSBMYXlvdXRTdGF0ZURpc2FibGVyLiBTaW5jZSB1c2luZyBhIExheW91dFN0 YXRlTWFpbnRhaW5lciBpcyBzbGlnaHRseSBtb3JlIGVmZmljaWVudCwKICAgICAvLyBhbmQgdGhp cyBtZXRob2Qgd2lsbCBiZSBjYWxsZWQgbWFueSB0aW1lcyBwZXIgc2Vjb25kIGR1cmluZyBwbGF5 YmFjaywgdXNlIGEgTGF5b3V0U3RhdGVNYWludGFpbmVyOgogICAgIExheW91dFN0YXRlTWFpbnRh aW5lciBzdGF0ZVB1c2hlcih2aWV3KCksIHRoaXMsIEludFNpemUoeCgpLCB5KCkpLCBoYXNUcmFu c2Zvcm0oKSB8fCBoYXNSZWZsZWN0aW9uKCkgfHwgc3R5bGUoKS0+aXNGbGlwcGVkQmxvY2tzV3Jp dGluZ01vZGUoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCmluZGV4IGRh YTlkOThhM2RkZjJjZjIzZTYyNzVlMDgzOGI3NGQxMjI4NjY1ZTAuLjFiYjA4NmU0NzcxMGM3NzVh YjUwOGFmNTYwZDlkMDAxZTY0MjBiMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZp ZXcuaApAQCAtMTI1LDEzICsxMjUsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBsYXlvdXRTdGF0ZUVu YWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2xheW91dFN0YXRlRGlzYWJsZUNvdW50ID09IDAgJiYg bV9sYXlvdXRTdGF0ZTsgfQogICAgIExheW91dFN0YXRlKiBsYXlvdXRTdGF0ZSgpIGNvbnN0IHsg cmV0dXJuIG1fbGF5b3V0U3RhdGU7IH0KIAotICAgIC8vIFN1c3BlbmRzIHRoZSBMYXlvdXRTdGF0 ZSBvcHRpbWl6YXRpb24uIFVzZWQgdW5kZXIgdHJhbnNmb3JtcyB0aGF0IGNhbm5vdCBiZSByZXBy ZXNlbnRlZCBieQotICAgIC8vIExheW91dFN0YXRlIChjb21tb24gaW4gU1ZHKSBhbmQgd2hlbiBt YW5pcHVsYXRpbmcgdGhlIHJlbmRlciB0cmVlIGR1cmluZyBsYXlvdXQgaW4gd2F5cwotICAgIC8v IHRoYXQgY2FuIHRyaWdnZXIgcmVwYWludCBvZiBhIG5vbi1jaGlsZCAoZS5nLiB3aGVuIGEgbGlz dCBpdGVtIG1vdmVzIGl0cyBsaXN0IG1hcmtlciBhcm91bmQpLgotICAgIC8vIE5vdGUgdGhhdCBl dmVuIHdoZW4gZGlzYWJsZWQsIExheW91dFN0YXRlIGlzIHN0aWxsIHVzZWQgdG8gc3RvcmUgbGF5 b3V0RGVsdGEuCi0gICAgdm9pZCBkaXNhYmxlTGF5b3V0U3RhdGUoKSB7IG1fbGF5b3V0U3RhdGVE aXNhYmxlQ291bnQrKzsgfQotICAgIHZvaWQgZW5hYmxlTGF5b3V0U3RhdGUoKSB7IEFTU0VSVCht X2xheW91dFN0YXRlRGlzYWJsZUNvdW50ID4gMCk7IG1fbGF5b3V0U3RhdGVEaXNhYmxlQ291bnQt LTsgfQotCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUhpdFRlc3RSZXN1bHQoSGl0VGVzdFJlc3Vs dCYsIGNvbnN0IEludFBvaW50Jik7CiAKICAgICB1bnNpZ25lZCBwYWdlTG9naWNhbEhlaWdodCgp IGNvbnN0IHsgcmV0dXJuIG1fcGFnZUxvZ2ljYWxIZWlnaHQ7IH0KQEAgLTE5NSwxMCArMTg4LDE5 IEBAIHByaXZhdGU6CiAgICAgICAgIHN0YXRlLT5kZXN0cm95KHJlbmRlckFyZW5hKCkpOwogICAg IH0KIAorICAgIC8vIFN1c3BlbmRzIHRoZSBMYXlvdXRTdGF0ZSBvcHRpbWl6YXRpb24uIFVzZWQg dW5kZXIgdHJhbnNmb3JtcyB0aGF0IGNhbm5vdCBiZSByZXByZXNlbnRlZCBieQorICAgIC8vIExh eW91dFN0YXRlIChjb21tb24gaW4gU1ZHKSBhbmQgd2hlbiBtYW5pcHVsYXRpbmcgdGhlIHJlbmRl ciB0cmVlIGR1cmluZyBsYXlvdXQgaW4gd2F5cworICAgIC8vIHRoYXQgY2FuIHRyaWdnZXIgcmVw YWludCBvZiBhIG5vbi1jaGlsZCAoZS5nLiB3aGVuIGEgbGlzdCBpdGVtIG1vdmVzIGl0cyBsaXN0 IG1hcmtlciBhcm91bmQpLgorICAgIC8vIE5vdGUgdGhhdCBldmVuIHdoZW4gZGlzYWJsZWQsIExh eW91dFN0YXRlIGlzIHN0aWxsIHVzZWQgdG8gc3RvcmUgbGF5b3V0RGVsdGEuCisgICAgLy8gVGhl c2UgZnVuY3Rpb25zIG1heSBvbmx5IGJlIGFjY2Vzc2VkIGJ5IExheW91dFN0YXRlTWFpbnRhaW5l ciBvciBMYXlvdXRTdGF0ZURpc2FibGVyLgorICAgIHZvaWQgZGlzYWJsZUxheW91dFN0YXRlKCkg eyBtX2xheW91dFN0YXRlRGlzYWJsZUNvdW50Kys7IH0KKyAgICB2b2lkIGVuYWJsZUxheW91dFN0 YXRlKCkgeyBBU1NFUlQobV9sYXlvdXRTdGF0ZURpc2FibGVDb3VudCA+IDApOyBtX2xheW91dFN0 YXRlRGlzYWJsZUNvdW50LS07IH0KKwogICAgIHNpemVfdCBnZXRSZXRhaW5lZFdpZGdldHMoVmVj dG9yPFJlbmRlcldpZGdldCo+Jik7CiAgICAgdm9pZCByZWxlYXNlV2lkZ2V0cyhWZWN0b3I8UmVu ZGVyV2lkZ2V0Kj4mKTsKICAgICAKICAgICBmcmllbmQgY2xhc3MgTGF5b3V0U3RhdGVNYWludGFp bmVyOworICAgIGZyaWVuZCBjbGFzcyBMYXlvdXRTdGF0ZURpc2FibGVyOwogICAgICAgICAKIHBy b3RlY3RlZDoKICAgICBGcmFtZVZpZXcqIG1fZnJhbWVWaWV3OwpAQCAtMzIxLDYgKzMyMywyNSBA QCBwcml2YXRlOgogICAgIGJvb2wgbV9kaWRDcmVhdGVMYXlvdXRTdGF0ZSA6IDE7IC8vIHRydWUg aWYgd2UgYWN0dWFsbHkgbWFkZSBhIGxheW91dCBzdGF0ZS4KIH07CiAKK2NsYXNzIExheW91dFN0 YXRlRGlzYWJsZXIgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKExheW91dFN0YXRlRGlzYWJs ZXIpOworcHVibGljOgorICAgIExheW91dFN0YXRlRGlzYWJsZXIoUmVuZGVyVmlldyogdmlldykK KyAgICAgICAgOiBtX3ZpZXcodmlldykKKyAgICB7CisgICAgICAgIGlmIChtX3ZpZXcpCisgICAg ICAgICAgICBtX3ZpZXctPmRpc2FibGVMYXlvdXRTdGF0ZSgpOworICAgIH0KKworICAgIH5MYXlv dXRTdGF0ZURpc2FibGVyKCkKKyAgICB7CisgICAgICAgIGlmIChtX3ZpZXcpCisgICAgICAgICAg ICBtX3ZpZXctPmVuYWJsZUxheW91dFN0YXRlKCk7CisgICAgfQorcHJpdmF0ZToKKyAgICBSZW5k ZXJWaWV3KiBtX3ZpZXc7Cit9OworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAv LyBSZW5kZXJWaWV3X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUm9vdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jvb3QuY3BwCmluZGV4IDVlOGEwMDJiZjk2YzA4NDNmZjFiYjgyNTg5YTI2Mzk2ODAzNTE0Yzcu LmI5Y2E1ZWM2YjA0YTAwY2E0ODA3MzkxMDc2NmVjOTUwYTg0ZGQ4NzcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcApAQCAtMTAzLDcgKzEwMyw3 IEBAIHZvaWQgUmVuZGVyU1ZHUm9vdDo6bGF5b3V0KCkKICAgICBBU1NFUlQobmVlZHNMYXlvdXQo KSk7CiAKICAgICAvLyBBcmJpdHJhcnkgYWZmaW5lIHRyYW5zZm9ybXMgYXJlIGluY29tcGF0aWJs ZSB3aXRoIExheW91dFN0YXRlLgotICAgIHZpZXcoKS0+ZGlzYWJsZUxheW91dFN0YXRlKCk7Cisg ICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAKICAg ICBib29sIG5lZWRzTGF5b3V0ID0gc2VsZk5lZWRzTGF5b3V0KCk7CiAgICAgTGF5b3V0UmVwYWlu dGVyIHJlcGFpbnRlcigqdGhpcywgY2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkgJiYgbmVl ZHNMYXlvdXQpOwpAQCAtMTI4LDcgKzEyOCw2IEBAIHZvaWQgUmVuZGVyU1ZHUm9vdDo6bGF5b3V0 KCkKIAogICAgIHJlcGFpbnRlci5yZXBhaW50QWZ0ZXJMYXlvdXQoKTsKIAotICAgIHZpZXcoKS0+ ZW5hYmxlTGF5b3V0U3RhdGUoKTsKICAgICBzZXROZWVkc0xheW91dChmYWxzZSk7CiB9CiAK 94733 2011-05-24 20:33:14 -0700 2011-05-25 00:17:34 -0700 Addressed nit bug-61352-20110524203312.patch text/plain 15281 yuzo U3VidmVyc2lvbiBSZXZpc2lvbjogODcyNTgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyYWYxMDhjOTVkMjU4YTY3 ZmIzODNlMGI0ODhlMWY5NzNjM2QwYjJiLi45ZGExYzAwYzE4Mjg4ZWRlYjI3MDI1YjhmNDliZDVi ZmI4ODUxZWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDUtMjQgIFl1em8g RnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbnQg VGFtdXJhLgorCisgICAgICAgIEZpeCBmb3IgQnVnIDYxMzUyIC0gUmVmYWN0b3IgUmVuZGVyVmll dzo6e2VuYWJsZSxkaXNhYmxlfUxheW91dFN0YXRlIGNhbGwgc2l0ZXMgdG8gdXNlIFJJSUEKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMzUyCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAg ICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlck1lZGlhVm9sdW1lU2xpZGVyQ29udGFpbmVyOjpsYXlvdXQpOgorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCbG9jazo6dXBkYXRlRmlyc3RMZXR0ZXIpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRl TGF5ZXJQb3NpdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZVNj cm9sbEluZm9BZnRlckxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6bGF5b3V0KToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGlzdEl0ZW06OnVwZGF0ZU1hcmtlckxvY2F0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTWVkaWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVkaWE6OmxheW91dCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clZpZXc6OmRpc2FibGVMYXlvdXRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3 OjplbmFibGVMYXlvdXRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZURpc2Fi bGVyOjpMYXlvdXRTdGF0ZURpc2FibGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRl RGlzYWJsZXI6On5MYXlvdXRTdGF0ZURpc2FibGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jvb3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUm9vdDo6bGF5 b3V0KToKKwogMjAxMS0wNS0yNCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBzdHlsZSBlcnJvci4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAppbmRleCA4 YzIxNmRlZDI4MWI4N2ZjOGI3NWM0OTE3OTBmMmJjYzMxMzg4NTU3Li41NGE0NTM5MjU1ODU3Mzcy OTI4NjQ1OTkxYmJiYzE4ZTM1ZTg0MzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCkBAIC0xNjcsMTUgKzE2NywxMSBAQCB2 b2lkIFJlbmRlck1lZGlhVm9sdW1lU2xpZGVyQ29udGFpbmVyOjpsYXlvdXQoKQogCiAgICAgUmVu ZGVyQm94KiBidXR0b25Cb3ggPSB0b1JlbmRlckJveChwcmV2aW91c1NpYmxpbmcoKSk7CiAKLSAg ICBpZiAodmlldygpKQotICAgICAgICB2aWV3KCktPmRpc2FibGVMYXlvdXRTdGF0ZSgpOworICAg IExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogCiAgICAg SW50UG9pbnQgb2Zmc2V0ID0gdGhlbWUoKS0+dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0 b24oYnV0dG9uQm94LCBJbnRTaXplKHdpZHRoKCksIGhlaWdodCgpKSk7CiAgICAgc2V0WChvZmZz ZXQueCgpICsgYnV0dG9uQm94LT5vZmZzZXRMZWZ0KCkpOwogICAgIHNldFkob2Zmc2V0LnkoKSAr IGJ1dHRvbkJveC0+b2Zmc2V0VG9wKCkpOwotCi0gICAgaWYgKHZpZXcoKSkKLSAgICAgICAgdmll dygpLT5lbmFibGVMYXlvdXRTdGF0ZSgpOwogfQogCiBpbmxpbmUgTWVkaWFDb250cm9sVm9sdW1l U2xpZGVyQ29udGFpbmVyRWxlbWVudDo6TWVkaWFDb250cm9sVm9sdW1lU2xpZGVyQ29udGFpbmVy RWxlbWVudChIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAKaW5kZXggNDc5NWJjZWNkZDQ0YzNlYTA1NDBmOTY4MzlhMmE0ZDY4MWVjYmEwYi4u N2FjNjBlMDFkMjU0ODgxNzM1MjM4N2E3NmZiYmNkMjBjYTMxZWQ5OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcApAQCAtOTc4LDI2ICs5NzgsMjMgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91 dChib29sIGFsbG93U3VidHJlZSkKIAogICAgIG1fYWN0aW9uU2NoZWR1bGVyLT5wYXVzZSgpOwog Ci0gICAgYm9vbCBkaXNhYmxlTGF5b3V0U3RhdGUgPSBmYWxzZTsKLSAgICBpZiAoc3VidHJlZSkg ewotICAgICAgICBSZW5kZXJWaWV3KiB2aWV3ID0gcm9vdC0+dmlldygpOwotICAgICAgICBkaXNh YmxlTGF5b3V0U3RhdGUgPSB2aWV3LT5zaG91bGREaXNhYmxlTGF5b3V0U3RhdGVGb3JTdWJ0cmVl KHJvb3QpOwotICAgICAgICB2aWV3LT5wdXNoTGF5b3V0U3RhdGUocm9vdCk7Ci0gICAgICAgIGlm IChkaXNhYmxlTGF5b3V0U3RhdGUpCi0gICAgICAgICAgICB2aWV3LT5kaXNhYmxlTGF5b3V0U3Rh dGUoKTsKLSAgICB9Ci0gICAgICAgIAotICAgIG1faW5MYXlvdXQgPSB0cnVlOwotICAgIGJlZ2lu RGVmZXJyZWRSZXBhaW50cygpOwotICAgIHJvb3QtPmxheW91dCgpOwotICAgIGVuZERlZmVycmVk UmVwYWludHMoKTsKLSAgICBtX2luTGF5b3V0ID0gZmFsc2U7CisgICAgeworICAgICAgICBib29s IGRpc2FibGVMYXlvdXRTdGF0ZSA9IGZhbHNlOworICAgICAgICBpZiAoc3VidHJlZSkgeworICAg ICAgICAgICAgUmVuZGVyVmlldyogdmlldyA9IHJvb3QtPnZpZXcoKTsKKyAgICAgICAgICAgIGRp c2FibGVMYXlvdXRTdGF0ZSA9IHZpZXctPnNob3VsZERpc2FibGVMYXlvdXRTdGF0ZUZvclN1YnRy ZWUocm9vdCk7CisgICAgICAgICAgICB2aWV3LT5wdXNoTGF5b3V0U3RhdGUocm9vdCk7CisgICAg ICAgIH0KKyAgICAgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKGRp c2FibGVMYXlvdXRTdGF0ZSA/IHJvb3QtPnZpZXcoKSA6IDApOworCisgICAgICAgIG1faW5MYXlv dXQgPSB0cnVlOworICAgICAgICBiZWdpbkRlZmVycmVkUmVwYWludHMoKTsKKyAgICAgICAgcm9v dC0+bGF5b3V0KCk7CisgICAgICAgIGVuZERlZmVycmVkUmVwYWludHMoKTsKKyAgICAgICAgbV9p bkxheW91dCA9IGZhbHNlOwogCi0gICAgaWYgKHN1YnRyZWUpIHsKLSAgICAgICAgUmVuZGVyVmll dyogdmlldyA9IHJvb3QtPnZpZXcoKTsKLSAgICAgICAgdmlldy0+cG9wTGF5b3V0U3RhdGUocm9v dCk7Ci0gICAgICAgIGlmIChkaXNhYmxlTGF5b3V0U3RhdGUpCi0gICAgICAgICAgICB2aWV3LT5l bmFibGVMYXlvdXRTdGF0ZSgpOworICAgICAgICBpZiAoc3VidHJlZSkKKyAgICAgICAgICAgIHJv b3QtPnZpZXcoKS0+cG9wTGF5b3V0U3RhdGUocm9vdCk7CiAgICAgfQogICAgIG1fbGF5b3V0Um9v dCA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGIw ODZkMGQyNjcxNmE0MGQ5MzU2ZDZmZGUwZTU4ZjQ5ODdjZDE4ODEuLjM3NzYyZTNhMjE2MDdjZjZh MjEyNzk2YjY1NjZkMDc2ZWRkMjUwOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcApAQCAtMjIyNSw3ICsyMjI1LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6cmVwYWlu dE92ZXJoYW5naW5nRmxvYXRzKGJvb2wgcGFpbnRBbGxEZXNjZW5kYW50cykKIAogICAgIC8vIEZJ WE1FOiBBdm9pZCBkaXNhYmxpbmcgTGF5b3V0U3RhdGUuIEF0IHRoZSB2ZXJ5IGxlYXN0LCBkb24n dCBkaXNhYmxlIGl0IGZvciBmbG9hdHMgb3JpZ2luYXRpbmcKICAgICAvLyBpbiB0aGlzIGJsb2Nr LiBCZXR0ZXIgeWV0IHdvdWxkIGJlIHRvIHB1c2ggZXh0cmEgc3RhdGUgZm9yIHRoZSBjb250YWlu ZXJzIG9mIG90aGVyIGZsb2F0cy4KLSAgICB2aWV3KCktPmRpc2FibGVMYXlvdXRTdGF0ZSgpOwor ICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAg IEZsb2F0aW5nT2JqZWN0U2V0JiBmbG9hdGluZ09iamVjdFNldCA9IG1fZmxvYXRpbmdPYmplY3Rz LT5zZXQoKTsKICAgICBGbG9hdGluZ09iamVjdFNldEl0ZXJhdG9yIGVuZCA9IGZsb2F0aW5nT2Jq ZWN0U2V0LmVuZCgpOwogICAgIGZvciAoRmxvYXRpbmdPYmplY3RTZXRJdGVyYXRvciBpdCA9IGZs b2F0aW5nT2JqZWN0U2V0LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewpAQCAtMjIzOCw3ICsy MjM4LDYgQEAgdm9pZCBSZW5kZXJCbG9jazo6cmVwYWludE92ZXJoYW5naW5nRmxvYXRzKGJvb2wg cGFpbnRBbGxEZXNjZW5kYW50cykKICAgICAgICAgICAgIHItPm1fcmVuZGVyZXItPnJlcGFpbnRP dmVyaGFuZ2luZ0Zsb2F0cygpOwogICAgICAgICB9CiAgICAgfQotICAgIHZpZXcoKS0+ZW5hYmxl TGF5b3V0U3RhdGUoKTsKIH0KICAKIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50KFBhaW50SW5mbyYg cGFpbnRJbmZvLCBpbnQgdHgsIGludCB0eSkKQEAgLTUzNTEsMTQgKzUzNTAsMTQgQEAgdm9pZCBS ZW5kZXJCbG9jazo6dXBkYXRlRmlyc3RMZXR0ZXIoKQogICAgICAgICAgICAgbmV3Rmlyc3RMZXR0 ZXItPnNldFN0eWxlKHBzZXVkb1N0eWxlKTsKIAogICAgICAgICAgICAgLy8gTW92ZSB0aGUgZmly c3QgbGV0dGVyIGludG8gdGhlIG5ldyByZW5kZXJlci4KLSAgICAgICAgICAgIHZpZXcoKS0+ZGlz YWJsZUxheW91dFN0YXRlKCk7CisgICAgICAgICAgICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91 dFN0YXRlRGlzYWJsZXIodmlldygpKTsKICAgICAgICAgICAgIHdoaWxlIChSZW5kZXJPYmplY3Qq IGNoaWxkID0gZmlyc3RMZXR0ZXItPmZpcnN0Q2hpbGQoKSkgewogICAgICAgICAgICAgICAgIGlm IChjaGlsZC0+aXNUZXh0KCkpCiAgICAgICAgICAgICAgICAgICAgIHRvUmVuZGVyVGV4dChjaGls ZCktPnJlbW92ZUFuZERlc3Ryb3lUZXh0Qm94ZXMoKTsKICAgICAgICAgICAgICAgICBmaXJzdExl dHRlci0+cmVtb3ZlQ2hpbGQoY2hpbGQpOwogICAgICAgICAgICAgICAgIG5ld0ZpcnN0TGV0dGVy LT5hZGRDaGlsZChjaGlsZCwgMCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAKKwogICAg ICAgICAgICAgUmVuZGVyVGV4dEZyYWdtZW50KiByZW1haW5pbmdUZXh0ID0gMDsKICAgICAgICAg ICAgIFJlbmRlck9iamVjdCogbmV4dFNpYmxpbmcgPSBmaXJzdExldHRlci0+bmV4dFNpYmxpbmco KTsKICAgICAgICAgICAgIFJlbmRlck9iamVjdCogbmV4dCA9IG5leHRTaWJsaW5nOwpAQCAtNTM3 Nyw3ICs1Mzc2LDYgQEAgdm9pZCBSZW5kZXJCbG9jazo6dXBkYXRlRmlyc3RMZXR0ZXIoKQogICAg ICAgICAgICAgZmlyc3RMZXR0ZXItPmRlc3Ryb3koKTsKICAgICAgICAgICAgIGZpcnN0TGV0dGVy ID0gbmV3Rmlyc3RMZXR0ZXI7CiAgICAgICAgICAgICBmaXJzdExldHRlckNvbnRhaW5lci0+YWRk Q2hpbGQoZmlyc3RMZXR0ZXIsIG5leHRTaWJsaW5nKTsKLSAgICAgICAgICAgIHZpZXcoKS0+ZW5h YmxlTGF5b3V0U3RhdGUoKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBmaXJzdExldHRl ci0+c2V0U3R5bGUocHNldWRvU3R5bGUpOwogCkBAIC01Mzk3LDcgKzUzOTUsNyBAQCB2b2lkIFJl bmRlckJsb2NrOjp1cGRhdGVGaXJzdExldHRlcigpCiAKICAgICAvLyBPdXIgbGF5b3V0IHN0YXRl IGlzIG5vdCB2YWxpZCBmb3IgdGhlIHJlcGFpbnRzIHdlIGFyZSBnb2luZyB0byB0cmlnZ2VyIGJ5 CiAgICAgLy8gYWRkaW5nIGFuZCByZW1vdmluZyBjaGlsZHJlbiBvZiBmaXJzdExldHRlckNvbnRh aW5lci4KLSAgICB2aWV3KCktPmRpc2FibGVMYXlvdXRTdGF0ZSgpOworICAgIExheW91dFN0YXRl RGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogCiAgICAgUmVuZGVyVGV4dCog dGV4dE9iaiA9IHRvUmVuZGVyVGV4dChjdXJyQ2hpbGQpOwogCkBAIC01NDYwLDcgKzU0NTgsNiBA QCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVGaXJzdExldHRlcigpCiAKICAgICAgICAgdGV4dE9i ai0+ZGVzdHJveSgpOwogICAgIH0KLSAgICB2aWV3KCktPmVuYWJsZUxheW91dFN0YXRlKCk7CiB9 CiAKIC8vIEhlbHBlciBtZXRob2RzIGZvciBvYnRhaW5pbmcgdGhlIGxhc3QgbGluZSwgY29tcHV0 aW5nIGxpbmUgY291bnRzIGFuZCBoZWlnaHRzIGZvciBsaW5lIGNvdW50cwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggYzkzNzYwNDYyM2UxOTAwYjg4ZDkyNjIy NTlmYjc5ZmM0MmQ3YTMyNi4uM2RlMzQ1MTIwOWE0YmZhNGQwOTQ4NWYwN2Q2NzAyOTU0YzU5ZTA5 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0zMDksNyAr MzA5LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnMoVXBkYXRlTGF5 ZXJQb3NpdGlvbnNGbGFncyBmbGFncywgSW50UG9pbnQKICAgICBpZiAobV9oYXNWaXNpYmxlQ29u dGVudCkgewogICAgICAgICBSZW5kZXJWaWV3KiB2aWV3ID0gcmVuZGVyZXIoKS0+dmlldygpOwog ICAgICAgICBBU1NFUlQodmlldyk7Ci0gICAgICAgIC8vIEZJWE1FOiBPcHRpbWl6ZSB1c2luZyBM YXlvdXRTdGF0ZSBhbmQgcmVtb3ZlIHRoZSBkaXNhYmxlTGF5b3V0U3RhdGUoKSBjYWxsCisgICAg ICAgIC8vIEZJWE1FOiBPcHRpbWl6ZSB1c2luZyBMYXlvdXRTdGF0ZSBhbmQgcmVtb3ZlIExheW91 dFN0YXRlRGlzYWJsZXIgaW5zdGFudGlhdGlvbgogICAgICAgICAvLyBmcm9tIHVwZGF0ZVNjcm9s bEluZm9BZnRlckxheW91dCgpLgogICAgICAgICBBU1NFUlQoIXZpZXctPmxheW91dFN0YXRlRW5h YmxlZCgpKTsKIApAQCAtMjE4MSwxMiArMjE4MSw5IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0 ZVNjcm9sbEluZm9BZnRlckxheW91dCgpCiAgICAgICAgICAgICBBU1NFUlQodmlldyk7CiAgICAg ICAgICAgICAvLyBzY3JvbGxUb09mZnNldCgpIG1heSBjYWxsIHVwZGF0ZUxheWVyUG9zaXRpb25z KCksIHdoaWNoIGRvZXNuJ3Qgd29yawogICAgICAgICAgICAgLy8gd2l0aCBMYXlvdXRTdGF0ZS4K LSAgICAgICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGRpc2FibGVMYXlvdXRTdGF0ZS9lbmFi bGVMYXlvdXRTdGF0ZSBpZiB0aGUgYWJvdmUgY2hhbmdlcy4KLSAgICAgICAgICAgIGlmICh2aWV3 KQotICAgICAgICAgICAgICAgIHZpZXctPmRpc2FibGVMYXlvdXRTdGF0ZSgpOworICAgICAgICAg ICAgLy8gRklYTUU6IFJlbW92ZSB0aGUgTGF5b3V0U3RhdGVEaXNhYmxlciBpbnN0YW50aWF0aW9u IGlmIHRoZSBhYm92ZSBjaGFuZ2VzLgorICAgICAgICAgICAgTGF5b3V0U3RhdGVEaXNhYmxlciBs YXlvdXRTdGF0ZURpc2FibGVyKHZpZXcpOwogICAgICAgICAgICAgc2Nyb2xsVG9PZmZzZXQobmV3 WCwgbmV3WSk7Ci0gICAgICAgICAgICBpZiAodmlldykKLSAgICAgICAgICAgICAgICB2aWV3LT5l bmFibGVMYXlvdXRTdGF0ZSgpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0yMjYxLDEwICsyMjU4 LDExIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbEluZm9BZnRlckxheW91dCgpCiAg ICAgfQogIAogICAgIFJlbmRlclZpZXcqIHZpZXcgPSByZW5kZXJlcigpLT52aWV3KCk7Ci0gICAg dmlldy0+ZGlzYWJsZUxheW91dFN0YXRlKCk7Ci0gICAgc2Nyb2xsVG9PZmZzZXQoc2Nyb2xsWE9m ZnNldCgpLCBzY3JvbGxZT2Zmc2V0KCkpOwotICAgIHZpZXctPmVuYWJsZUxheW91dFN0YXRlKCk7 Ci0gCisgICAgeworICAgICAgICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJs ZXIodmlldyk7CisgICAgICAgIHNjcm9sbFRvT2Zmc2V0KHNjcm9sbFhPZmZzZXQoKSwgc2Nyb2xs WU9mZnNldCgpKTsKKyAgICB9CisKICAgICBpZiAocmVuZGVyZXIoKS0+bm9kZSgpICYmIHJlbmRl cmVyKCktPmRvY3VtZW50KCktPmhhc0xpc3RlbmVyVHlwZShEb2N1bWVudDo6T1ZFUkZMT1dDSEFO R0VEX0xJU1RFTkVSKSkKICAgICAgICAgdXBkYXRlT3ZlcmZsb3dTdGF0dXMoaG9yaXpvbnRhbE92 ZXJmbG93LCB2ZXJ0aWNhbE92ZXJmbG93KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMaXN0Qm94LmNwcAppbmRleCBmMDNmZDU0OGFmNWVhNGMxZDNmYjYwY2M5MmNmODllMjQ1 MDAyNzg4Li45ZjViZmM3ZWFjZWFhY2Y5MjA3NDZiZTYyYTAwNjdhOGJmM2RmODY3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCkBAIC0xNTAsOSArMTUwLDgg QEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpsYXlvdXQoKQogewogICAgIFJlbmRlckJsb2NrOjpsYXlv dXQoKTsKICAgICBpZiAobV9zY3JvbGxUb1JldmVhbFNlbGVjdGlvbkFmdGVyTGF5b3V0KSB7Ci0g ICAgICAgIHZpZXcoKS0+ZGlzYWJsZUxheW91dFN0YXRlKCk7CisgICAgICAgIExheW91dFN0YXRl RGlzYWJsZXIgbGF5b3V0U3RhdGVEaXNhYmxlcih2aWV3KCkpOwogICAgICAgICBzY3JvbGxUb1Jl dmVhbFNlbGVjdGlvbigpOwotICAgICAgICB2aWV3KCktPmVuYWJsZUxheW91dFN0YXRlKCk7CiAg ICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcApp bmRleCBlYWY2OGU2YzkwYjdiMTU5NzYyODFiMzdmMmVkYjMwYWQ3MmM5ZTYzLi5mY2I4YjJiYTNk Zjc2OGVlZTI5YzBmNmM0NGUxYzgzMjI1OGY5ZmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKQEAgLTIxMyw3ICsyMTMsNyBAQCB2b2lkIFJlbmRlckxp c3RJdGVtOjp1cGRhdGVNYXJrZXJMb2NhdGlvbigpCiAgICAgICAgIGlmIChtYXJrZXJQYXIgIT0g bGluZUJveFBhcmVudCB8fCBtX21hcmtlci0+cHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KCkp IHsKICAgICAgICAgICAgIC8vIFJlbW92aW5nIGFuZCBhZGRpbmcgdGhlIG1hcmtlciBjYW4gdHJp Z2dlciByZXBhaW50aW5nIGluCiAgICAgICAgICAgICAvLyBjb250YWluZXJzIG90aGVyIHRoYW4g b3Vyc2VsdmVzLCBzbyB3ZSBuZWVkIHRvIGRpc2FibGUgTGF5b3V0U3RhdGUuCi0gICAgICAgICAg ICB2aWV3KCktPmRpc2FibGVMYXlvdXRTdGF0ZSgpOworICAgICAgICAgICAgTGF5b3V0U3RhdGVE aXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAgICAgICAgICAgICB1cGRhdGVG aXJzdExldHRlcigpOwogICAgICAgICAgICAgbV9tYXJrZXItPnJlbW92ZSgpOwogICAgICAgICAg ICAgaWYgKCFsaW5lQm94UGFyZW50KQpAQCAtMjIxLDcgKzIyMSw2IEBAIHZvaWQgUmVuZGVyTGlz dEl0ZW06OnVwZGF0ZU1hcmtlckxvY2F0aW9uKCkKICAgICAgICAgICAgIGxpbmVCb3hQYXJlbnQt PmFkZENoaWxkKG1fbWFya2VyLCBmaXJzdE5vbk1hcmtlckNoaWxkKGxpbmVCb3hQYXJlbnQpKTsK ICAgICAgICAgICAgIGlmIChtX21hcmtlci0+cHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KCkp CiAgICAgICAgICAgICAgICAgbV9tYXJrZXItPmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhz KCk7Ci0gICAgICAgICAgICB2aWV3KCktPmVuYWJsZUxheW91dFN0YXRlKCk7CiAgICAgICAgIH0K ICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVk aWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcAppbmRleCBl MzY2ZDllNTRlNmVmZGU2NmJmZmYxZTA3ZDJmNmI5OGIzNTQ4OTBhLi5kYzhkMmRkNjZhMjRlOTMx OTMyZDQ4YWQwMzI5ZDhmOWEyZjAzN2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWVkaWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNZWRpYS5jcHAKQEAgLTcwLDcgKzcwLDcgQEAgdm9pZCBSZW5kZXJNZWRpYTo6bGF5b3V0KCkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gV2hlbiBjYWxsaW5nIGxheW91dCgpIG9uIGEgY2hp bGQgbm9kZSwgYSBwYXJlbnQgbXVzdCBlaXRoZXIgcHVzaCBhIExheW91dFN0YXRlTWFpbnRhaW50 ZXIsIG9yIAotICAgIC8vIGNhbGwgdmlldygpLT5kaXNhYmxlTGF5b3V0U3RhdGUoKS4gIFNpbmNl IHVzaW5nIGEgTGF5b3V0U3RhdGVNYWludGFpbmVyIGlzIHNsaWdodGx5IG1vcmUgZWZmaWNpZW50 LAorICAgIC8vIGluc3RhbnRpYXRlIExheW91dFN0YXRlRGlzYWJsZXIuIFNpbmNlIHVzaW5nIGEg TGF5b3V0U3RhdGVNYWludGFpbmVyIGlzIHNsaWdodGx5IG1vcmUgZWZmaWNpZW50LAogICAgIC8v IGFuZCB0aGlzIG1ldGhvZCB3aWxsIGJlIGNhbGxlZCBtYW55IHRpbWVzIHBlciBzZWNvbmQgZHVy aW5nIHBsYXliYWNrLCB1c2UgYSBMYXlvdXRTdGF0ZU1haW50YWluZXI6CiAgICAgTGF5b3V0U3Rh dGVNYWludGFpbmVyIHN0YXRlUHVzaGVyKHZpZXcoKSwgdGhpcywgSW50U2l6ZSh4KCksIHkoKSks IGhhc1RyYW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZSgpLT5pc0ZsaXBwZWRC bG9ja3NXcml0aW5nTW9kZSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgK aW5kZXggZGFhOWQ5OGEzZGRmMmNmMjNlNjI3NWUwODM4Yjc0ZDEyMjg2NjVlMC4uMWJiMDg2ZTQ3 NzEwYzc3NWFiNTA4YWY1NjBkOWQwMDFlNjQyMGIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVmlldy5oCkBAIC0xMjUsMTMgKzEyNSw2IEBAIHB1YmxpYzoKICAgICBib29sIGxheW91 dFN0YXRlRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0U3RhdGVEaXNhYmxlQ291bnQg PT0gMCAmJiBtX2xheW91dFN0YXRlOyB9CiAgICAgTGF5b3V0U3RhdGUqIGxheW91dFN0YXRlKCkg Y29uc3QgeyByZXR1cm4gbV9sYXlvdXRTdGF0ZTsgfQogCi0gICAgLy8gU3VzcGVuZHMgdGhlIExh eW91dFN0YXRlIG9wdGltaXphdGlvbi4gVXNlZCB1bmRlciB0cmFuc2Zvcm1zIHRoYXQgY2Fubm90 IGJlIHJlcHJlc2VudGVkIGJ5Ci0gICAgLy8gTGF5b3V0U3RhdGUgKGNvbW1vbiBpbiBTVkcpIGFu ZCB3aGVuIG1hbmlwdWxhdGluZyB0aGUgcmVuZGVyIHRyZWUgZHVyaW5nIGxheW91dCBpbiB3YXlz Ci0gICAgLy8gdGhhdCBjYW4gdHJpZ2dlciByZXBhaW50IG9mIGEgbm9uLWNoaWxkIChlLmcuIHdo ZW4gYSBsaXN0IGl0ZW0gbW92ZXMgaXRzIGxpc3QgbWFya2VyIGFyb3VuZCkuCi0gICAgLy8gTm90 ZSB0aGF0IGV2ZW4gd2hlbiBkaXNhYmxlZCwgTGF5b3V0U3RhdGUgaXMgc3RpbGwgdXNlZCB0byBz dG9yZSBsYXlvdXREZWx0YS4KLSAgICB2b2lkIGRpc2FibGVMYXlvdXRTdGF0ZSgpIHsgbV9sYXlv dXRTdGF0ZURpc2FibGVDb3VudCsrOyB9Ci0gICAgdm9pZCBlbmFibGVMYXlvdXRTdGF0ZSgpIHsg QVNTRVJUKG1fbGF5b3V0U3RhdGVEaXNhYmxlQ291bnQgPiAwKTsgbV9sYXlvdXRTdGF0ZURpc2Fi bGVDb3VudC0tOyB9Ci0KICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlSGl0VGVzdFJlc3VsdChIaXRU ZXN0UmVzdWx0JiwgY29uc3QgSW50UG9pbnQmKTsKIAogICAgIHVuc2lnbmVkIHBhZ2VMb2dpY2Fs SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlTG9naWNhbEhlaWdodDsgfQpAQCAtMTk1LDEw ICsxODgsMTkgQEAgcHJpdmF0ZToKICAgICAgICAgc3RhdGUtPmRlc3Ryb3kocmVuZGVyQXJlbmEo KSk7CiAgICAgfQogCisgICAgLy8gU3VzcGVuZHMgdGhlIExheW91dFN0YXRlIG9wdGltaXphdGlv bi4gVXNlZCB1bmRlciB0cmFuc2Zvcm1zIHRoYXQgY2Fubm90IGJlIHJlcHJlc2VudGVkIGJ5Cisg ICAgLy8gTGF5b3V0U3RhdGUgKGNvbW1vbiBpbiBTVkcpIGFuZCB3aGVuIG1hbmlwdWxhdGluZyB0 aGUgcmVuZGVyIHRyZWUgZHVyaW5nIGxheW91dCBpbiB3YXlzCisgICAgLy8gdGhhdCBjYW4gdHJp Z2dlciByZXBhaW50IG9mIGEgbm9uLWNoaWxkIChlLmcuIHdoZW4gYSBsaXN0IGl0ZW0gbW92ZXMg aXRzIGxpc3QgbWFya2VyIGFyb3VuZCkuCisgICAgLy8gTm90ZSB0aGF0IGV2ZW4gd2hlbiBkaXNh YmxlZCwgTGF5b3V0U3RhdGUgaXMgc3RpbGwgdXNlZCB0byBzdG9yZSBsYXlvdXREZWx0YS4KKyAg ICAvLyBUaGVzZSBmdW5jdGlvbnMgbWF5IG9ubHkgYmUgYWNjZXNzZWQgYnkgTGF5b3V0U3RhdGVN YWludGFpbmVyIG9yIExheW91dFN0YXRlRGlzYWJsZXIuCisgICAgdm9pZCBkaXNhYmxlTGF5b3V0 U3RhdGUoKSB7IG1fbGF5b3V0U3RhdGVEaXNhYmxlQ291bnQrKzsgfQorICAgIHZvaWQgZW5hYmxl TGF5b3V0U3RhdGUoKSB7IEFTU0VSVChtX2xheW91dFN0YXRlRGlzYWJsZUNvdW50ID4gMCk7IG1f bGF5b3V0U3RhdGVEaXNhYmxlQ291bnQtLTsgfQorCiAgICAgc2l6ZV90IGdldFJldGFpbmVkV2lk Z2V0cyhWZWN0b3I8UmVuZGVyV2lkZ2V0Kj4mKTsKICAgICB2b2lkIHJlbGVhc2VXaWRnZXRzKFZl Y3RvcjxSZW5kZXJXaWRnZXQqPiYpOwogICAgIAogICAgIGZyaWVuZCBjbGFzcyBMYXlvdXRTdGF0 ZU1haW50YWluZXI7CisgICAgZnJpZW5kIGNsYXNzIExheW91dFN0YXRlRGlzYWJsZXI7CiAgICAg ICAgIAogcHJvdGVjdGVkOgogICAgIEZyYW1lVmlldyogbV9mcmFtZVZpZXc7CkBAIC0zMjEsNiAr MzIzLDI1IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2RpZENyZWF0ZUxheW91dFN0YXRlIDogMTsg Ly8gdHJ1ZSBpZiB3ZSBhY3R1YWxseSBtYWRlIGEgbGF5b3V0IHN0YXRlLgogfTsKIAorY2xhc3Mg TGF5b3V0U3RhdGVEaXNhYmxlciB7CisgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoTGF5b3V0U3Rh dGVEaXNhYmxlcik7CitwdWJsaWM6CisgICAgTGF5b3V0U3RhdGVEaXNhYmxlcihSZW5kZXJWaWV3 KiB2aWV3KQorICAgICAgICA6IG1fdmlldyh2aWV3KQorICAgIHsKKyAgICAgICAgaWYgKG1fdmll dykKKyAgICAgICAgICAgIG1fdmlldy0+ZGlzYWJsZUxheW91dFN0YXRlKCk7CisgICAgfQorCisg ICAgfkxheW91dFN0YXRlRGlzYWJsZXIoKQorICAgIHsKKyAgICAgICAgaWYgKG1fdmlldykKKyAg ICAgICAgICAgIG1fdmlldy0+ZW5hYmxlTGF5b3V0U3RhdGUoKTsKKyAgICB9Citwcml2YXRlOgor ICAgIFJlbmRlclZpZXcqIG1fdmlldzsKK307CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAog I2VuZGlmIC8vIFJlbmRlclZpZXdfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUm9vdC5jcHAKaW5kZXggNWU4YTAwMmJmOTZjMDg0M2ZmMWJiODI1ODlhMjYzOTY4 MDM1MTRjNy4uYjljYTVlYzZiMDRhMDBjYTQ4MDczOTEwNzY2ZWM5NTBhODRkZDg3NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCkBAIC0xMDMs NyArMTAzLDcgQEAgdm9pZCBSZW5kZXJTVkdSb290OjpsYXlvdXQoKQogICAgIEFTU0VSVChuZWVk c0xheW91dCgpKTsKIAogICAgIC8vIEFyYml0cmFyeSBhZmZpbmUgdHJhbnNmb3JtcyBhcmUgaW5j b21wYXRpYmxlIHdpdGggTGF5b3V0U3RhdGUuCi0gICAgdmlldygpLT5kaXNhYmxlTGF5b3V0U3Rh dGUoKTsKKyAgICBMYXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIodmlldygp KTsKIAogICAgIGJvb2wgbmVlZHNMYXlvdXQgPSBzZWxmTmVlZHNMYXlvdXQoKTsKICAgICBMYXlv dXRSZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBjaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQo KSAmJiBuZWVkc0xheW91dCk7CkBAIC0xMjgsNyArMTI4LDYgQEAgdm9pZCBSZW5kZXJTVkdSb290 OjpsYXlvdXQoKQogCiAgICAgcmVwYWludGVyLnJlcGFpbnRBZnRlckxheW91dCgpOwogCi0gICAg dmlldygpLT5lbmFibGVMYXlvdXRTdGF0ZSgpOwogICAgIHNldE5lZWRzTGF5b3V0KGZhbHNlKTsK IH0KIAo=