113829 2013-04-02 15:10:17 -0700 [BlackBerry] Decouple layout viewport from visual viewport 2013-04-03 06:16:21 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson cgarcia jkjiang jpetsovits mifenton mlattanzio rwlbuis tonikitoo webkit.review.bot xan.lopez oldest_to_newest 868271 0 anilsson 2013-04-02 15:10:17 -0700 Setting the visual viewport will force the layout viewport equal to the visual viewport. Decouple by allowing the user to specify a layout viewport (which could be the exact same value they pass for visual viewport, if that's their cup of tea). PR #318757 868279 1 196237 anilsson 2013-04-02 15:20:00 -0700 Created attachment 196237 Patch 868284 2 mlattanzio 2013-04-02 15:24:28 -0700 Looks good. 868491 3 196237 cgarcia 2013-04-03 00:17:50 -0700 Comment on attachment 196237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196237&action=review Looks good to me in general, but patch doesn't seem to apply. > Source/WebKit/blackberry/Api/WebPage.cpp:3915 > + // If the viewport didn't change, try to apply only the new default layout size Comments should finish with a period. > Source/WebKit/blackberry/Api/WebPage.cpp:3945 > + static ViewportArguments defaultViewportArguments; > + if (d->m_viewportArguments != defaultViewportArguments) { > + setVirtualViewportSize(d->recomputeVirtualViewportFromViewportArguments()); > + needsLayout = true; recomputeVirtualViewportFromViewportArguments already checks whether viewport arguments have changed, so you could avoid checking it twice, by checking if the returned rectangle is empty. > Source/WebKit/blackberry/Api/WebPage.h:144 > + // Returns the size of the visual viewport Ditto. > Source/WebKit/blackberry/Api/WebPage.h:147 > + // Sets the sizes of the visual viewport and the layout viewport Ditto. > Source/WebKit/blackberry/Api/WebPage.h:153 > + // Returns the size of the layout viewport Ditto. 868505 4 196237 anilsson 2013-04-03 01:01:42 -0700 Comment on attachment 196237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196237&action=review >> Source/WebKit/blackberry/Api/WebPage.cpp:3945 >> + needsLayout = true; > > recomputeVirtualViewportFromViewportArguments already checks whether viewport arguments have changed, so you could avoid checking it twice, by checking if the returned rectangle is empty. This is a great idea, to avoid duplicating the ugly "static ViewportArguments defaultViewportArguments" line all over the place. 868506 5 196295 anilsson 2013-04-03 01:04:21 -0700 Created attachment 196295 Patch 868508 6 196295 cgarcia 2013-04-03 01:08:37 -0700 Comment on attachment 196295 Patch Looks great. 868601 7 196295 webkit.review.bot 2013-04-03 04:04:51 -0700 Comment on attachment 196295 Patch Clearing flags on attachment: 196295 Committed r147537: <http://trac.webkit.org/changeset/147537> 868602 8 webkit.review.bot 2013-04-03 04:04:55 -0700 All reviewed patches have been landed. Closing bug. 868667 9 anilsson 2013-04-03 06:16:21 -0700 Thanks for the review, I found one more place where we can apply the idea and get rid of static ViewportArguments defaultViewportArguments;. 196237 2013-04-02 15:20:00 -0700 2013-04-03 01:04:13 -0700 Patch bug-113829-20130403001950.patch text/plain 7593 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBkMzRiMjQ1YWYyMGUwN2ZkNzZkNjczOWFlMThmZjE3NWUxZThhYmJlLi4zMDk3YjczYmU2 NjcwZTFkNTg3ZmVmYTA5OGU4NmYwMzllMzgxZmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMy0wNC0wMiAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIERlY291cGxlIGxheW91dCB2aWV3 cG9ydCBmcm9tIHZpc3VhbCB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTEzODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2V0dGluZyB0aGUgdmlzdWFsIHZpZXdwb3J0IHdvdWxkIGZvcmNl IHRoZSBsYXlvdXQgdmlld3BvcnQgZXF1YWwgdG8KKyAgICAgICAgdGhlIHZpc3VhbCB2aWV3cG9y dC4gRGVjb3VwbGUgdGhlIHZpZXdwb3J0cyBieSBhbGxvd2luZyB0aGUgdXNlciB0bworICAgICAg ICBzcGVjaWZ5IGEgbGF5b3V0IHZpZXdwb3J0IHdoZW4gc2V0dGluZyB0aGUgdmlld3BvcnQocyku IFRoZSBsYXlvdXQKKyAgICAgICAgdmlld3BvcnQgY291bGQgYmUgdGhlIGV4YWN0IHNhbWUgdmFs dWUgcGFzc2VkIGZvciB2aXN1YWwgdmlld3BvcnQsIGlmCisgICAgICAgIHRoZSBvbGQgYmVoYXZp b3IgaXMgZGVzaXJlZC4KKworICAgICAgICBBbHNvIHJlZXZhbHVhdGUgYW55IHZpZXdwb3J0IGFy Z3VtZW50cyB3aGVuIChvbmx5KSB0aGUgbGF5b3V0IHZpZXdwb3J0CisgICAgICAgIGNoYW5nZXMg aW4gV2ViUGFnZTo6c2V0RGVmYXVsdExheW91dFNpemUoKSBzaW5jZSB0aGUgbGF5b3V0IHZpZXdw b3J0IGlzCisgICAgICAgIHVzZWQgYXMgaW5wdXQgdG8gdGhlIGNhbGN1bGF0aW9uLgorCisgICAg ICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQ YWdlUHJpdmF0ZTo6c2V0U2NyZWVuT3JpZW50YXRpb24pOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6c2V0Vmlld3BvcnRTaXplKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6V2ViUGFnZTo6c2V0Vmlld3BvcnRTaXplKToKKyAgICAgICAgKFdlYktp dCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpzZXREZWZh dWx0TGF5b3V0U2l6ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6OmRl ZmF1bHRMYXlvdXRTaXplKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5oOgorICAgICAgICAqIEFw aS9XZWJQYWdlX3AuaDoKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKwogMjAxMy0wMy0yNiAg QXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnld IFNjcm9sbGluZyB1cCBhbmQgZG93biBjYW4gY2F1c2UgdGhlIHNjcmVlbiB0byBmbGFzaCBibGFj awpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggZTljZTMxYmE2 ZWI4NDQ2ZGNmZmYxNGI2MTIzNThkYTI3MzE3YWMzNS4uMTM4YmEyMTVhMjNkNmU4OTA0YTIxMmNj Y2JjZDkzNmM5YjhlZWQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwCkBAIC0zNjU2LDExICszNjU2LDExIEBAIHZvaWQgV2ViUGFnZTo6YXBwbHlQZW5kaW5nT3Jp ZW50YXRpb25JZk5lZWRlZCgpCiAgICAgZC0+bV9pbnB1dEhhbmRsZXItPnJlZHJhd1NwZWxsQ2hl Y2tEaWFsb2dJZlJlcXVpcmVkKGZhbHNlIC8qIHNob3VsZE1vdmVEaWFsb2cgKi8pOwogfQogCi12 b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgdHJhbnNm b3JtZWRBY3R1YWxWaXNpYmxlU2l6ZSwgYm9vbCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlKQor Ym9vbCBXZWJQYWdlUHJpdmF0ZTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0IEludFNpemUmIHRyYW5z Zm9ybWVkQWN0dWFsVmlzaWJsZVNpemUsIGNvbnN0IEludFNpemUmIGRlZmF1bHRMYXlvdXRTaXpl LCBib29sIGVuc3VyZUZvY3VzRWxlbWVudFZpc2libGUpCiB7CiAgICAgUGxhdGZvcm06OmxvZ0Fs d2F5cyhQbGF0Zm9ybTo6TG9nTGV2ZWxDcml0aWNhbCwgIlNldHRpbmcgdmlld3BvcnQgc2l6ZSB0 byAlZCwlZCBzaG91bGQgYWZmZWN0IENvbnRlbnQiLCB0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVT aXplLndpZHRoKCksIHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUuaGVpZ2h0KCkpOwogICAg IGlmIChtX3BlbmRpbmdPcmllbnRhdGlvbiA9PSAtMSAmJiB0cmFuc2Zvcm1lZEFjdHVhbFZpc2li bGVTaXplID09IHRoaXMtPnRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUoKSkKLSAgICAgICAg cmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBTdXNwZW5kIGFsbCBzY3Jl ZW4gdXBkYXRlcyB0byB0aGUgYmFja2luZ3N0b3JlIHRvIG1ha2Ugc3VyZSBuby1vbmUgdHJpZXMg dG8gYmxpdAogICAgIC8vIHdoaWxlIHRoZSB3aW5kb3cgc3VyZmFjZSBhbmQgdGhlIEJhY2tpbmdT dG9yZSBhcmUgb3V0IG9mIHN5bmMuCkBAIC0zNjg1LDcgKzM2ODUsNyBAQCB2b2lkIFdlYlBhZ2VQ cml2YXRlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgdHJhbnNmb3JtZWRBY3R1YWxW aXNpYmxlU2l6ZQogICAgIGJvb2wgYXRUb3AgPSAhc2Nyb2xsUG9zaXRpb24oKS55KCk7CiAgICAg Ym9vbCBhdExlZnQgPSAhc2Nyb2xsUG9zaXRpb24oKS54KCk7CiAKLSAgICBzZXREZWZhdWx0TGF5 b3V0U2l6ZSh0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXplKTsKKyAgICBzZXREZWZhdWx0TGF5 b3V0U2l6ZShkZWZhdWx0TGF5b3V0U2l6ZSk7CiAKICAgICAvLyBSZWNvbXB1dGUgb3VyIHZpcnR1 YWwgdmlld3BvcnQuCiAgICAgYm9vbCBuZWVkc0xheW91dCA9IGZhbHNlOwpAQCAtMzkwNSwxMSAr MzkwNSwxNiBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50 U2l6ZSYgdHJhbnNmb3JtZWRBY3R1YWxWaXNpYmxlU2l6ZQogCiAgICAgbV9iYWNraW5nU3RvcmUt PmQtPnJlc3VtZVNjcmVlblVwZGF0ZXMoc2NyZWVuUmVzdW1lT3BlcmF0aW9uKTsKICAgICBtX2lu cHV0SGFuZGxlci0+cmVkcmF3U3BlbGxDaGVja0RpYWxvZ0lmUmVxdWlyZWQoKTsKKworICAgIHJl dHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2U6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBQbGF0 Zm9ybTo6SW50U2l6ZSYgdmlld3BvcnRTaXplLCBib29sIGVuc3VyZUZvY3VzRWxlbWVudFZpc2li bGUpCit2b2lkIFdlYlBhZ2U6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBQbGF0Zm9ybTo6SW50U2l6 ZSYgdmlld3BvcnRTaXplLCBjb25zdCBQbGF0Zm9ybTo6SW50U2l6ZSYgZGVmYXVsdExheW91dFNp emUsIGJvb2wgZW5zdXJlRm9jdXNFbGVtZW50VmlzaWJsZSkKIHsKLSAgICBkLT5zZXRWaWV3cG9y dFNpemUodmlld3BvcnRTaXplLCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlKTsKKyAgICBpZiAo IWQtPnNldFZpZXdwb3J0U2l6ZSh2aWV3cG9ydFNpemUsIGRlZmF1bHRMYXlvdXRTaXplLCBlbnN1 cmVGb2N1c0VsZW1lbnRWaXNpYmxlKSkgeworICAgICAgICAvLyBJZiB0aGUgdmlld3BvcnQgZGlk bid0IGNoYW5nZSwgdHJ5IHRvIGFwcGx5IG9ubHkgdGhlIG5ldyBkZWZhdWx0IGxheW91dCBzaXpl CisgICAgICAgIHNldERlZmF1bHRMYXlvdXRTaXplKGRlZmF1bHRMYXlvdXRTaXplKTsKKyAgICB9 CiB9CiAKIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldERlZmF1bHRMYXlvdXRTaXplKGNvbnN0IElu dFNpemUmIHNpemUpCkBAIC0zOTE5LDE0ICszOTI0LDMwIEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6 OnNldERlZmF1bHRMYXlvdXRTaXplKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgbV9kZWZhdWx0 TGF5b3V0U2l6ZSA9IHNpemUuZXhwYW5kZWRUbyhtaW5pbXVtTGF5b3V0U2l6ZSkuc2hydW5rVG8o c2NyZWVuU2l6ZSk7CiB9CiAKK1BsYXRmb3JtOjpJbnRTaXplIFdlYlBhZ2U6OmRlZmF1bHRMYXlv dXRTaXplKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZC0+bV9kZWZhdWx0TGF5b3V0U2l6ZTsKK30K Kwogdm9pZCBXZWJQYWdlOjpzZXREZWZhdWx0TGF5b3V0U2l6ZShjb25zdCBQbGF0Zm9ybTo6SW50 U2l6ZSYgcGxhdGZvcm1TaXplKQogeworICAgIGJvb2wgbmVlZHNMYXlvdXQgPSBmYWxzZTsKICAg ICBXZWJDb3JlOjpJbnRTaXplIHNpemUgPSBwbGF0Zm9ybVNpemU7CiAgICAgaWYgKHNpemUgPT0g ZC0+bV9kZWZhdWx0TGF5b3V0U2l6ZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgLy8gVGhlIGRl ZmF1bHQgbGF5b3V0IHNpemUgYWZmZWN0cyBpbnRlcnByZXRhdGlvbiBvZiBhbnkgdmlld3BvcnQg YXJndW1lbnRzIHByZXNlbnQuCiAgICAgZC0+c2V0RGVmYXVsdExheW91dFNpemUoc2l6ZSk7Ci0g ICAgYm9vbCBuZWVkc0xheW91dCA9IGQtPnNldFZpZXdNb2RlKGQtPnZpZXdNb2RlKCkpOworCisg ICAgc3RhdGljIFZpZXdwb3J0QXJndW1lbnRzIGRlZmF1bHRWaWV3cG9ydEFyZ3VtZW50czsKKyAg ICBpZiAoZC0+bV92aWV3cG9ydEFyZ3VtZW50cyAhPSBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHMp IHsKKyAgICAgICAgc2V0VmlydHVhbFZpZXdwb3J0U2l6ZShkLT5yZWNvbXB1dGVWaXJ0dWFsVmll d3BvcnRGcm9tVmlld3BvcnRBcmd1bWVudHMoKSk7CisgICAgICAgIG5lZWRzTGF5b3V0ID0gdHJ1 ZTsKKyAgICB9CisKKyAgICBpZiAoZC0+c2V0Vmlld01vZGUoZC0+dmlld01vZGUoKSkpCisgICAg ICAgIG5lZWRzTGF5b3V0ID0gdHJ1ZTsKKwogICAgIGlmIChuZWVkc0xheW91dCkgewogICAgICAg ICBkLT5zZXROZWVkc0xheW91dCgpOwogICAgICAgICBpZiAoIWQtPmlzTG9hZGluZygpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmggYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAppbmRleCAzYjI2YmZlZTEzMDZhZDdkYjk4 MTAyZjU4OTAwNjgyZWIwNzk2N2JlLi5mMmI2Mzk3N2FlZGM0ZGUxYjJhM2VlYWQ0NWY1NjcxMjJk MTRkNWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaApAQCAtMTQwLDEz ICsxNDAsMjAgQEAgcHVibGljOgogICAgIHZvaWQgYXBwbHlQZW5kaW5nT3JpZW50YXRpb25JZk5l ZWRlZCgpOwogCiAgICAgUGxhdGZvcm06OlZpZXdwb3J0QWNjZXNzb3IqIHdlYmtpdFRocmVhZFZp ZXdwb3J0QWNjZXNzb3IoKSBjb25zdDsKKworICAgIC8vIFJldHVybnMgdGhlIHNpemUgb2YgdGhl IHZpc3VhbCB2aWV3cG9ydAogICAgIFBsYXRmb3JtOjpJbnRTaXplIHZpZXdwb3J0U2l6ZSgpIGNv bnN0OwotICAgIHZvaWQgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJiwg Ym9vbCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlID0gdHJ1ZSk7CisKKyAgICAvLyBTZXRzIHRo ZSBzaXplcyBvZiB0aGUgdmlzdWFsIHZpZXdwb3J0IGFuZCB0aGUgbGF5b3V0IHZpZXdwb3J0Cisg ICAgdm9pZCBzZXRWaWV3cG9ydFNpemUoY29uc3QgUGxhdGZvcm06OkludFNpemUmIHZpZXdwb3J0 U2l6ZSwgY29uc3QgUGxhdGZvcm06OkludFNpemUmIGRlZmF1bHRMYXlvdXRTaXplLCBib29sIGVu c3VyZUZvY3VzRWxlbWVudFZpc2libGUgPSB0cnVlKTsKIAogICAgIHZvaWQgcmVzZXRWaXJ0dWFs Vmlld3BvcnRPbkNvbW1pdHRlZChib29sIHJlc2V0KTsKICAgICB2b2lkIHNldFZpcnR1YWxWaWV3 cG9ydFNpemUoY29uc3QgUGxhdGZvcm06OkludFNpemUmKTsKIAotICAgIC8vIFVzZWQgZm9yIGRl ZmF1bHQgbGF5b3V0IHNpemUgdW5sZXNzIG92ZXJyaWRkZW4gYnkgd2ViIGNvbnRlbnQgb3IgYnkg b3RoZXIgQVBJcy4KKyAgICAvLyBSZXR1cm5zIHRoZSBzaXplIG9mIHRoZSBsYXlvdXQgdmlld3Bv cnQKKyAgICBQbGF0Zm9ybTo6SW50U2l6ZSBkZWZhdWx0TGF5b3V0U2l6ZSgpIGNvbnN0OworCisg ICAgLy8gU2V0IHRoZSBzaXplIG9mIHRoZSBsYXlvdXQgdmlld3BvcnQsIGluIGRvY3VtZW50IGNv b3JkaW5hdGVzLCBpbmRlcGVuZGVudGx5IG9mIHRoZSB2aXN1YWwgdmlld3BvcnQuCiAgICAgdm9p ZCBzZXREZWZhdWx0TGF5b3V0U2l6ZShjb25zdCBQbGF0Zm9ybTo6SW50U2l6ZSYpOwogCiAgICAg Ym9vbCBtb3VzZUV2ZW50KGNvbnN0IFBsYXRmb3JtOjpNb3VzZUV2ZW50JiwgYm9vbCogd2hlZWxE ZWx0YUFjY2VwdGVkID0gMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2VfcC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3Au aAppbmRleCA5MmRlMDEwMjgzYzhjNjMzNmE4YTQ5YWRiNDAzYzEyNGViOGEyOWQ4Li5kZTlkYTM0 ODI3OGU0YzBhN2U0MTIxNGYyMTU3NDhlNzEwNzE1MzVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZV9wLmgKQEAgLTM3NSw5ICszNzUsOSBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIHNldFNjcmVlbk9yaWVudGF0aW9uKGludCk7CiAKLSAgICAvLyBTY3JvbGwgYW5kL29yIHpv b20gc28gdGhhdCB0aGUgV2ViUGFnZSBmaXRzIHRoZSBuZXcgYWN0dWFsCi0gICAgLy8gdmlzaWJs ZSBzaXplLgotICAgIHZvaWQgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUm IHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUsIGJvb2wgZW5zdXJlRm9jdXNFbGVtZW50Vmlz aWJsZSk7CisgICAgLy8gU2Nyb2xsIGFuZC9vciB6b29tIHNvIHRoYXQgdGhlIFdlYlBhZ2UgZml0 cyB0aGUgbmV3IGFjdHVhbCB2aXNpYmxlIHNpemUsIGEuay5hLiB2aXN1YWwgdmlld3BvcnQuCisg ICAgLy8gQWxzbyBzZXRzIHRoZSBkZWZhdWx0IGxheW91dCBzaXplLCBhLmsuYS4gdGhlIGxheW91 dCB2aWV3cG9ydC4KKyAgICBib29sIHNldFZpZXdwb3J0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRT aXplJiB0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXplLCBjb25zdCBXZWJDb3JlOjpJbnRTaXpl JiBkZWZhdWx0TGF5b3V0U2l6ZSwgYm9vbCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlKTsKIAog ICAgIHZvaWQgc2NoZWR1bGVEZWZlcnJhYmxlVGltZXIoV2ViQ29yZTo6VGltZXI8V2ViUGFnZVBy aXZhdGU+KiwgZG91YmxlIHRpbWVPdXQpOwogICAgIHZvaWQgdW5zY2hlZHVsZUFsbERlZmVycmFi bGVUaW1lcnMoKTsK 196295 2013-04-03 01:04:21 -0700 2013-04-03 04:04:51 -0700 Patch bug-113829-20130403100411.patch text/plain 7373 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA4N2E0N2I2NmQ0NWUxNzE4MDRjZTk3YmJhZWZmOGUyNTM0MzI2MThhLi4zM2M1MjBiMWMx NWQ2YjcxYTg2NTQyM2M0ZDlkNzJlNDJlYWJlZGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMy0wNC0wMiAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIERlY291cGxlIGxheW91dCB2aWV3 cG9ydCBmcm9tIHZpc3VhbCB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTEzODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2V0dGluZyB0aGUgdmlzdWFsIHZpZXdwb3J0IHdvdWxkIGZvcmNl IHRoZSBsYXlvdXQgdmlld3BvcnQgZXF1YWwgdG8KKyAgICAgICAgdGhlIHZpc3VhbCB2aWV3cG9y dC4gRGVjb3VwbGUgdGhlIHZpZXdwb3J0cyBieSBhbGxvd2luZyB0aGUgdXNlciB0bworICAgICAg ICBzcGVjaWZ5IGEgbGF5b3V0IHZpZXdwb3J0IHdoZW4gc2V0dGluZyB0aGUgdmlld3BvcnQocyku IFRoZSBsYXlvdXQKKyAgICAgICAgdmlld3BvcnQgY291bGQgYmUgdGhlIGV4YWN0IHNhbWUgdmFs dWUgcGFzc2VkIGZvciB2aXN1YWwgdmlld3BvcnQsIGlmCisgICAgICAgIHRoZSBvbGQgYmVoYXZp b3IgaXMgZGVzaXJlZC4KKworICAgICAgICBBbHNvIHJlZXZhbHVhdGUgYW55IHZpZXdwb3J0IGFy Z3VtZW50cyB3aGVuIChvbmx5KSB0aGUgbGF5b3V0IHZpZXdwb3J0CisgICAgICAgIGNoYW5nZXMg aW4gV2ViUGFnZTo6c2V0RGVmYXVsdExheW91dFNpemUoKSBzaW5jZSB0aGUgbGF5b3V0IHZpZXdw b3J0IGlzCisgICAgICAgIHVzZWQgYXMgaW5wdXQgdG8gdGhlIGNhbGN1bGF0aW9uLgorCisgICAg ICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQ YWdlUHJpdmF0ZTo6c2V0U2NyZWVuT3JpZW50YXRpb24pOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6c2V0Vmlld3BvcnRTaXplKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6V2ViUGFnZTo6c2V0Vmlld3BvcnRTaXplKToKKyAgICAgICAgKFdlYktp dCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpzZXREZWZh dWx0TGF5b3V0U2l6ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6OmRl ZmF1bHRMYXlvdXRTaXplKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5oOgorICAgICAgICAqIEFw aS9XZWJQYWdlX3AuaDoKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKwogMjAxMy0wNC0wMiAg TWF4aW0gTW9naWxuaXRza3kgIDxtbW9naWxuaXRza3lAcmltLmNvbT4KIAogICAgICAgICBbQmxh Y2tCZXJyeV0gQVBJIHVwZGF0ZSBmb3IgSW50UmVjdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZS5jcHAKaW5kZXggMmE4NDIyOGEzNDA5ODZlYzMwY2M5ODE5MjAwZmNkNGE5Y2Ri MDA2Mi4uNWYwMzI3MThkMTRmZWI4ZTQyNTc1MGQxMDhkOTU3ZWY1ZWQ0OTdhOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC0zNjUwLDEwICszNjUwLDEwIEBA IHZvaWQgV2ViUGFnZTo6YXBwbHlQZW5kaW5nT3JpZW50YXRpb25JZk5lZWRlZCgpCiAgICAgZC0+ bV9pbnB1dEhhbmRsZXItPnJlZHJhd1NwZWxsQ2hlY2tEaWFsb2dJZlJlcXVpcmVkKGZhbHNlIC8q IHNob3VsZE1vdmVEaWFsb2cgKi8pOwogfQogCi12b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRWaWV3 cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgdHJhbnNmb3JtZWRBY3R1YWxWaXNpYmxlU2l6ZSwgYm9v bCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlKQorYm9vbCBXZWJQYWdlUHJpdmF0ZTo6c2V0Vmll d3BvcnRTaXplKGNvbnN0IEludFNpemUmIHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUsIGNv bnN0IEludFNpemUmIGRlZmF1bHRMYXlvdXRTaXplLCBib29sIGVuc3VyZUZvY3VzRWxlbWVudFZp c2libGUpCiB7CiAgICAgaWYgKG1fcGVuZGluZ09yaWVudGF0aW9uID09IC0xICYmIHRyYW5zZm9y bWVkQWN0dWFsVmlzaWJsZVNpemUgPT0gdGhpcy0+dHJhbnNmb3JtZWRBY3R1YWxWaXNpYmxlU2l6 ZSgpKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFN1 c3BlbmQgYWxsIHNjcmVlbiB1cGRhdGVzIHRvIHRoZSBiYWNraW5nc3RvcmUgdG8gbWFrZSBzdXJl IG5vLW9uZSB0cmllcyB0byBibGl0CiAgICAgLy8gd2hpbGUgdGhlIHdpbmRvdyBzdXJmYWNlIGFu ZCB0aGUgQmFja2luZ1N0b3JlIGFyZSBvdXQgb2Ygc3luYy4KQEAgLTM2NzgsNyArMzY3OCw3IEBA IHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldFZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiB0cmFu c2Zvcm1lZEFjdHVhbFZpc2libGVTaXplCiAgICAgYm9vbCBhdFRvcCA9ICFzY3JvbGxQb3NpdGlv bigpLnkoKTsKICAgICBib29sIGF0TGVmdCA9ICFzY3JvbGxQb3NpdGlvbigpLngoKTsKIAotICAg IHNldERlZmF1bHRMYXlvdXRTaXplKHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUpOworICAg IHNldERlZmF1bHRMYXlvdXRTaXplKGRlZmF1bHRMYXlvdXRTaXplKTsKIAogICAgIC8vIFJlY29t cHV0ZSBvdXIgdmlydHVhbCB2aWV3cG9ydC4KICAgICBib29sIG5lZWRzTGF5b3V0ID0gZmFsc2U7 CkBAIC0zODk4LDExICszODk4LDE2IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldFZpZXdwb3J0 U2l6ZShjb25zdCBJbnRTaXplJiB0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXplCiAKICAgICBt X2JhY2tpbmdTdG9yZS0+ZC0+cmVzdW1lU2NyZWVuVXBkYXRlcyhzY3JlZW5SZXN1bWVPcGVyYXRp b24pOwogICAgIG1faW5wdXRIYW5kbGVyLT5yZWRyYXdTcGVsbENoZWNrRGlhbG9nSWZSZXF1aXJl ZCgpOworCisgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgV2ViUGFnZTo6c2V0Vmlld3BvcnRT aXplKGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJiB2aWV3cG9ydFNpemUsIGJvb2wgZW5zdXJlRm9j dXNFbGVtZW50VmlzaWJsZSkKK3ZvaWQgV2ViUGFnZTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0IFBs YXRmb3JtOjpJbnRTaXplJiB2aWV3cG9ydFNpemUsIGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJiBk ZWZhdWx0TGF5b3V0U2l6ZSwgYm9vbCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlKQogewotICAg IGQtPnNldFZpZXdwb3J0U2l6ZSh2aWV3cG9ydFNpemUsIGVuc3VyZUZvY3VzRWxlbWVudFZpc2li bGUpOworICAgIGlmICghZC0+c2V0Vmlld3BvcnRTaXplKHZpZXdwb3J0U2l6ZSwgZGVmYXVsdExh eW91dFNpemUsIGVuc3VyZUZvY3VzRWxlbWVudFZpc2libGUpKSB7CisgICAgICAgIC8vIElmIHRo ZSB2aWV3cG9ydCBkaWRuJ3QgY2hhbmdlLCB0cnkgdG8gYXBwbHkgb25seSB0aGUgbmV3IGRlZmF1 bHQgbGF5b3V0IHNpemUuCisgICAgICAgIHNldERlZmF1bHRMYXlvdXRTaXplKGRlZmF1bHRMYXlv dXRTaXplKTsKKyAgICB9CiB9CiAKIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldERlZmF1bHRMYXlv dXRTaXplKGNvbnN0IEludFNpemUmIHNpemUpCkBAIC0zOTEyLDE0ICszOTE3LDMwIEBAIHZvaWQg V2ViUGFnZVByaXZhdGU6OnNldERlZmF1bHRMYXlvdXRTaXplKGNvbnN0IEludFNpemUmIHNpemUp CiAgICAgbV9kZWZhdWx0TGF5b3V0U2l6ZSA9IHNpemUuZXhwYW5kZWRUbyhtaW5pbXVtTGF5b3V0 U2l6ZSkuc2hydW5rVG8oc2NyZWVuU2l6ZSk7CiB9CiAKK1BsYXRmb3JtOjpJbnRTaXplIFdlYlBh Z2U6OmRlZmF1bHRMYXlvdXRTaXplKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZC0+bV9kZWZhdWx0 TGF5b3V0U2l6ZTsKK30KKwogdm9pZCBXZWJQYWdlOjpzZXREZWZhdWx0TGF5b3V0U2l6ZShjb25z dCBQbGF0Zm9ybTo6SW50U2l6ZSYgcGxhdGZvcm1TaXplKQogeworICAgIGJvb2wgbmVlZHNMYXlv dXQgPSBmYWxzZTsKICAgICBXZWJDb3JlOjpJbnRTaXplIHNpemUgPSBwbGF0Zm9ybVNpemU7CiAg ICAgaWYgKHNpemUgPT0gZC0+bV9kZWZhdWx0TGF5b3V0U2l6ZSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgZC0+c2V0RGVmYXVsdExheW91dFNpemUoc2l6ZSk7Ci0gICAgYm9vbCBuZWVkc0xheW91 dCA9IGQtPnNldFZpZXdNb2RlKGQtPnZpZXdNb2RlKCkpOworCisgICAgLy8gVGhlIGRlZmF1bHQg bGF5b3V0IHNpemUgYWZmZWN0cyBpbnRlcnByZXRhdGlvbiBvZiBhbnkgdmlld3BvcnQgYXJndW1l bnRzIHByZXNlbnQuCisgICAgUGxhdGZvcm06OkludFNpemUgdmlydHVhbFZpZXdwb3J0U2l6ZSA9 IGQtPnJlY29tcHV0ZVZpcnR1YWxWaWV3cG9ydEZyb21WaWV3cG9ydEFyZ3VtZW50cygpOworICAg IGlmICghdmlydHVhbFZpZXdwb3J0U2l6ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgc2V0VmlydHVh bFZpZXdwb3J0U2l6ZSh2aXJ0dWFsVmlld3BvcnRTaXplKTsKKyAgICAgICAgbmVlZHNMYXlvdXQg PSB0cnVlOworICAgIH0KKworICAgIGlmIChkLT5zZXRWaWV3TW9kZShkLT52aWV3TW9kZSgpKSkK KyAgICAgICAgbmVlZHNMYXlvdXQgPSB0cnVlOworCiAgICAgaWYgKG5lZWRzTGF5b3V0KSB7CiAg ICAgICAgIGQtPnNldE5lZWRzTGF5b3V0KCk7CiAgICAgICAgIGlmICghZC0+aXNMb2FkaW5nKCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oCmluZGV4IDJkYjFhZmUyNzM2MzRj NDBjYWYzZDg4MWY4NjRhMDI0ZmE4MzFjM2QuLjNmZGYxN2M1ZWIzYjBjYjg3NzAyMjgwYjNmYmI4 Yjc3Y2I0ODhjY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oCkBAIC0x NDIsMTMgKzE0MiwyMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBhcHBseVBlbmRpbmdPcmllbnRhdGlv bklmTmVlZGVkKCk7CiAKICAgICBQbGF0Zm9ybTo6Vmlld3BvcnRBY2Nlc3Nvciogd2Via2l0VGhy ZWFkVmlld3BvcnRBY2Nlc3NvcigpIGNvbnN0OworCisgICAgLy8gUmV0dXJucyB0aGUgc2l6ZSBv ZiB0aGUgdmlzdWFsIHZpZXdwb3J0LgogICAgIFBsYXRmb3JtOjpJbnRTaXplIHZpZXdwb3J0U2l6 ZSgpIGNvbnN0OwotICAgIHZvaWQgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFBsYXRmb3JtOjpJbnRT aXplJiwgYm9vbCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlID0gdHJ1ZSk7CisKKyAgICAvLyBT ZXRzIHRoZSBzaXplcyBvZiB0aGUgdmlzdWFsIHZpZXdwb3J0IGFuZCB0aGUgbGF5b3V0IHZpZXdw b3J0LgorICAgIHZvaWQgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJiB2 aWV3cG9ydFNpemUsIGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJiBkZWZhdWx0TGF5b3V0U2l6ZSwg Ym9vbCBlbnN1cmVGb2N1c0VsZW1lbnRWaXNpYmxlID0gdHJ1ZSk7CiAKICAgICB2b2lkIHJlc2V0 VmlydHVhbFZpZXdwb3J0T25Db21taXR0ZWQoYm9vbCByZXNldCk7CiAgICAgdm9pZCBzZXRWaXJ0 dWFsVmlld3BvcnRTaXplKGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJik7CiAKLSAgICAvLyBVc2Vk IGZvciBkZWZhdWx0IGxheW91dCBzaXplIHVubGVzcyBvdmVycmlkZGVuIGJ5IHdlYiBjb250ZW50 IG9yIGJ5IG90aGVyIEFQSXMuCisgICAgLy8gUmV0dXJucyB0aGUgc2l6ZSBvZiB0aGUgbGF5b3V0 IHZpZXdwb3J0LgorICAgIFBsYXRmb3JtOjpJbnRTaXplIGRlZmF1bHRMYXlvdXRTaXplKCkgY29u c3Q7CisKKyAgICAvLyBTZXQgdGhlIHNpemUgb2YgdGhlIGxheW91dCB2aWV3cG9ydCwgaW4gZG9j dW1lbnQgY29vcmRpbmF0ZXMsIGluZGVwZW5kZW50bHkgb2YgdGhlIHZpc3VhbCB2aWV3cG9ydC4K ICAgICB2b2lkIHNldERlZmF1bHRMYXlvdXRTaXplKGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJik7 CiAKICAgICBib29sIG1vdXNlRXZlbnQoY29uc3QgUGxhdGZvcm06Ok1vdXNlRXZlbnQmLCBib29s KiB3aGVlbERlbHRhQWNjZXB0ZWQgPSAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VfcC5oCmluZGV4IDUwMjVmNWFlNzAwNDkxNmZmOWJmZWFjMjg5NzUyODMwNzc2YWU0Yzcu LjFkYzU1MTQ0ZDY4OGRiMGJhODMyNmMxNGZkYjc4ZThkMzhmNTdlY2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMzc1LDkgKzM3NSw5IEBAIHB1YmxpYzoK IAogICAgIHZvaWQgc2V0U2NyZWVuT3JpZW50YXRpb24oaW50KTsKIAotICAgIC8vIFNjcm9sbCBh bmQvb3Igem9vbSBzbyB0aGF0IHRoZSBXZWJQYWdlIGZpdHMgdGhlIG5ldyBhY3R1YWwKLSAgICAv LyB2aXNpYmxlIHNpemUuCi0gICAgdm9pZCBzZXRWaWV3cG9ydFNpemUoY29uc3QgV2ViQ29yZTo6 SW50U2l6ZSYgdHJhbnNmb3JtZWRBY3R1YWxWaXNpYmxlU2l6ZSwgYm9vbCBlbnN1cmVGb2N1c0Vs ZW1lbnRWaXNpYmxlKTsKKyAgICAvLyBTY3JvbGwgYW5kL29yIHpvb20gc28gdGhhdCB0aGUgV2Vi UGFnZSBmaXRzIHRoZSBuZXcgYWN0dWFsIHZpc2libGUgc2l6ZSwgYS5rLmEuIHZpc3VhbCB2aWV3 cG9ydC4KKyAgICAvLyBBbHNvIHNldHMgdGhlIGRlZmF1bHQgbGF5b3V0IHNpemUsIGEuay5hLiB0 aGUgbGF5b3V0IHZpZXdwb3J0LgorICAgIGJvb2wgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFdlYkNv cmU6OkludFNpemUmIHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUsIGNvbnN0IFdlYkNvcmU6 OkludFNpemUmIGRlZmF1bHRMYXlvdXRTaXplLCBib29sIGVuc3VyZUZvY3VzRWxlbWVudFZpc2li bGUpOwogCiAgICAgdm9pZCBzY2hlZHVsZURlZmVycmFibGVUaW1lcihXZWJDb3JlOjpUaW1lcjxX ZWJQYWdlUHJpdmF0ZT4qLCBkb3VibGUgdGltZU91dCk7CiAgICAgdm9pZCB1bnNjaGVkdWxlQWxs RGVmZXJyYWJsZVRpbWVycygpOwo=