147694 2015-08-05 14:43:32 -0700 Subtree layout code should use RenderElement. 2015-08-07 14:25:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan cdumez commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 1115120 0 zalan 2015-08-05 14:43:32 -0700 ...instead of RenderObject. 1115123 1 258301 zalan 2015-08-05 14:47:09 -0700 Created attachment 258301 Patch 1115124 2 258301 cdumez 2015-08-05 14:50:46 -0700 Comment on attachment 258301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258301&action=review > Source/WebCore/inspector/InspectorTimelineAgent.cpp:352 > + RenderElement* root = frame.view()->layoutRoot(); nit: auto* would be nice. > Source/WebCore/page/FrameView.h:120 > + RenderElement* layoutRoot()const { return m_layoutRoot; } nit: Missing space before 'const'. 1115125 3 cdumez 2015-08-05 14:51:37 -0700 Sorry, did not mean to override Simon's r+. 1115130 4 258303 zalan 2015-08-05 15:01:28 -0700 Created attachment 258303 Patch 1115878 5 258303 commit-queue 2015-08-07 14:25:50 -0700 Comment on attachment 258303 Patch Clearing flags on attachment: 258303 Committed r188163: <http://trac.webkit.org/changeset/188163> 1115879 6 commit-queue 2015-08-07 14:25:54 -0700 All reviewed patches have been landed. Closing bug. 258301 2015-08-05 14:47:09 -0700 2015-08-05 15:01:25 -0700 Patch bug-147694-20150805144701.patch text/plain 8577 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTY4M2NlOWZhNzZiNDll NjRkOGZlOGNlYzgwY2JmMDEzZmVkMzBhOC4uNmIxZWVkMDU2OWU1MmMxM2QwMDBmZWRmYmRhODlh YzBjNGI3YzlkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE1LTA4LTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3VidHJlZSBsYXlvdXQgY29k ZSBzaG91bGQgdXNlIFJlbmRlckVsZW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc2OTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTdWJ0cmVlIGxheW91dCB3aWxsIG5ldmVyIGJlZ2luIGF0IGEg UmVuZGVyVGV4dCwgc28gdGlnaHRlbiB1cAorICAgICAgICB0aGUgY29kZSB0byBvcGVyYXRlIG9u IFJlbmRlckVsZW1lbnRzIGluc3RlYWQgb2YgUmVuZGVyT2JqZWN0cy4KKyAgICAgICAgKFRoaXMg cGF0Y2ggaXMgYmFzZWQgb24gd2Via2l0Lm9yZy9iLzEyNjg3OCkKKworICAgICAgICBObyBjaGFu Z2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OndpbGxMYXlvdXQpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVmlldzo6RnJhbWVWaWV3KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6bGF5b3V0Um9vdCk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluUmVnaW9uKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVt ZW50OjpjbGVhckxheW91dFJvb3RJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJF bGVtZW50Ojp3aWxsQmVEZXN0cm95ZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVt ZW50Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNsZWFyTGF5b3V0Um9vdElmTmVlZGVkKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6d2lsbEJlRGVzdHJveWVkKTogRGVsZXRl ZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisKIDIwMTUtMDgtMDUgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9m IERhdGFiYXNlQmFja2VuZCBhcyBhbm90aGVyIHN0ZXAgdG93YXJkcyBtZXJnaW5nIERhdGFiYXNl IGFuZCBEYXRhYmFzZUJhY2tlbmRCYXNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5kZXggOWQ3MjMwZjFiYWZjYWI1MzRkNDlk YmFjZjM1Y2RjN2Q3NmMxODRkZS4uZGQwNWRhNjc1ZDg1OTBmYzZkNWU0Yzk3NzU1MjRhZjQ0NTNi MDMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmNwcApAQCAtMzQ5LDcgKzM0OSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6ZGlkSW52YWxpZGF0ZUxheW91dChGcmFtZSYgZnJhbWUpCiAKIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6d2lsbExheW91dChGcmFtZSYgZnJhbWUpCiB7Ci0gICAgUmVuZGVyT2Jq ZWN0KiByb290ID0gZnJhbWUudmlldygpLT5sYXlvdXRSb290KCk7CisgICAgUmVuZGVyRWxlbWVu dCogcm9vdCA9IGZyYW1lLnZpZXcoKS0+bGF5b3V0Um9vdCgpOwogICAgIGJvb2wgcGFydGlhbExh eW91dCA9ICEhcm9vdDsKIAogICAgIGlmICghcGFydGlhbExheW91dCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAppbmRleCAzMDU2ZTMzYjZmNTQxYWUwYjFiYWExMGQ0ZTFiOThlNjU1YmY2YTM0 Li5iZjJlNmM3MWNlNGZiYjA4NTQ2MTNhYmExMGFjNzJmNDQwZDE0OWM3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCkBAIC0xNjQsNyArMTY0LDYgQEAgRnJhbWVWaWV3OjpGcmFtZVZpZXco RnJhbWUmIGZyYW1lKQogICAgIDogbV9mcmFtZShmcmFtZSkKICAgICAsIG1fY2FuSGF2ZVNjcm9s bGJhcnModHJ1ZSkKICAgICAsIG1fbGF5b3V0VGltZXIoKnRoaXMsICZGcmFtZVZpZXc6OmxheW91 dFRpbWVyRmlyZWQpCi0gICAgLCBtX2xheW91dFJvb3QobnVsbHB0cikKICAgICAsIG1fbGF5b3V0 UGhhc2UoT3V0c2lkZUxheW91dCkKICAgICAsIG1faW5TeW5jaHJvbm91c1Bvc3RMYXlvdXQoZmFs c2UpCiAgICAgLCBtX3Bvc3RMYXlvdXRUYXNrc1RpbWVyKCp0aGlzLCAmRnJhbWVWaWV3OjpwZXJm b3JtUG9zdExheW91dFRhc2tzKQpAQCAtMTEyOSwxMSArMTEyOCw2IEBAIHZvaWQgRnJhbWVWaWV3 OjpzZXRJc0luV2luZG93KGJvb2wgaXNJbldpbmRvdykKICAgICAgICAgcmVuZGVyVmlldy0+c2V0 SXNJbldpbmRvdyhpc0luV2luZG93KTsKIH0KIAotUmVuZGVyT2JqZWN0KiBGcmFtZVZpZXc6Omxh eW91dFJvb3QoYm9vbCBvbmx5RHVyaW5nTGF5b3V0KSBjb25zdAotewotICAgIHJldHVybiBvbmx5 RHVyaW5nTGF5b3V0ICYmIGxheW91dFBlbmRpbmcoKSA/IG51bGxwdHIgOiBtX2xheW91dFJvb3Q7 Ci19Ci0KIGlubGluZSB2b2lkIEZyYW1lVmlldzo6Zm9yY2VMYXlvdXRQYXJlbnRWaWV3SWZOZWVk ZWQoKQogewogICAgIFJlbmRlcldpZGdldCogb3duZXJSZW5kZXJlciA9IGZyYW1lKCkub3duZXJS ZW5kZXJlcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggZjUyZjllYTY4Y2ZhMzk0ZDlh YTdhMjdiYTc5NWEzYzg4NGU2YzQwMy4uN2U2MWQxOGU0M2EwZWFjZmFlNGM5MmUzNWM0OWI5MDli ZTVhODNjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC0xMTcsNyArMTE3LDcgQEAgcHVi bGljOgogICAgIGJvb2wgaXNJbkxheW91dCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0UGhhc2Ug PT0gSW5MYXlvdXQ7IH0KICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGluUGFpbnRhYmxlU3RhdGUo KSB7IHJldHVybiBtX2xheW91dFBoYXNlICE9IEluTGF5b3V0ICYmIG1fbGF5b3V0UGhhc2UgIT0g SW5WaWV3U2l6ZUFkanVzdCAmJiBtX2xheW91dFBoYXNlICE9IEluUG9zdExheW91dDsgfQogCi0g ICAgUmVuZGVyT2JqZWN0KiBsYXlvdXRSb290KGJvb2wgb25seUR1cmluZ0xheW91dCA9IGZhbHNl KSBjb25zdDsKKyAgICBSZW5kZXJFbGVtZW50KiBsYXlvdXRSb290KCljb25zdCB7IHJldHVybiBt X2xheW91dFJvb3Q7IH0KICAgICB2b2lkIGNsZWFyTGF5b3V0Um9vdCgpIHsgbV9sYXlvdXRSb290 ID0gbnVsbHB0cjsgfQogICAgIGludCBsYXlvdXRDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5 b3V0Q291bnQ7IH0KIApAQCAtNjk2LDcgKzY5Niw3IEBAIHByaXZhdGU6CiAKICAgICBUaW1lciBt X2xheW91dFRpbWVyOwogICAgIGJvb2wgbV9kZWxheWVkTGF5b3V0OwotICAgIFJlbmRlckVsZW1l bnQqIG1fbGF5b3V0Um9vdDsKKyAgICBSZW5kZXJFbGVtZW50KiBtX2xheW91dFJvb3QgeyBudWxs cHRyIH07CiAKICAgICBMYXlvdXRQaGFzZSBtX2xheW91dFBoYXNlOwogICAgIGJvb2wgbV9sYXlv dXRTY2hlZHVsaW5nRW5hYmxlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK aW5kZXggM2U4NmNjNjg5ZTRiNGY2MmUyMjIyZmNlNjEyMWFlYjJlYWM2Mjk4ZS4uYWE5N2RhZmEz NDA1ZWNjMWEwZGUwMTk4YjMzZmU5ZmU4Mjk2NTYzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKQEAgLTIzNDcsNyArMjM0Nyw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21w dXRlTG9naWNhbFdpZHRoSW5SZWdpb24oTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21w dXRlCiAgICAgfQogCiAgICAgLy8gSWYgbGF5b3V0IGlzIGxpbWl0ZWQgdG8gYSBzdWJ0cmVlLCB0 aGUgc3VidHJlZSByb290J3MgbG9naWNhbCB3aWR0aCBkb2VzIG5vdCBjaGFuZ2UuCi0gICAgaWYg KGVsZW1lbnQoKSAmJiB2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Um9vdCh0cnVlKSA9PSB0aGlz KQorICAgIGlmIChlbGVtZW50KCkgJiYgIXZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRQZW5kaW5n KCkgJiYgdmlldygpLmZyYW1lVmlldygpLmxheW91dFJvb3QoKSA9PSB0aGlzKQogICAgICAgICBy ZXR1cm47CiAKICAgICAvLyBUaGUgcGFyZW50IGJveCBpcyBmbGV4aW5nIHVzLCBzbyBpdCBoYXMg aW5jcmVhc2VkIG9yIGRlY3JlYXNlZCBvdXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJFbGVtZW50LmNwcAppbmRleCA1MGY4YTNlNWM3MWU1YTI1MzU2ZGFhNGRlOTRmMDJkMjMxYmIw MzcxLi5iMzA5Zjc3ZTRhYzE0OGJlNjM2OTgxNzVkZTc1OGVhMWFiZWU4MjI2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCkBAIC0xMDczLDYgKzEwNzMsMjQg QEAgdm9pZCBSZW5kZXJFbGVtZW50Ojp3aWxsQmVSZW1vdmVkRnJvbVRyZWUoKQogICAgIFJlbmRl ck9iamVjdDo6d2lsbEJlUmVtb3ZlZEZyb21UcmVlKCk7CiB9CiAKK2lubGluZSB2b2lkIFJlbmRl ckVsZW1lbnQ6OmNsZWFyTGF5b3V0Um9vdElmTmVlZGVkKCkgY29uc3QKK3sKKyAgICBpZiAoZG9j dW1lbnRCZWluZ0Rlc3Ryb3llZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAodmlldygp LmZyYW1lVmlldygpLmxheW91dFJvb3QoKSAhPSB0aGlzKQorICAgICAgICByZXR1cm47CisKKyAg ICAvLyBOb3JtYWxseSB3aGVuIGEgcmVuZGVyZXIgaXMgZGV0YWNoZWQgZnJvbSB0aGUgdHJlZSwg dGhlIGFwcHJvcHJpYXRlIGRpcnR5IGJpdHMgZ2V0IHNldAorICAgIC8vIHdoaWNoIGVuc3VyZXMg dGhhdCB0aGlzIHJlbmRlcmVyIGlzIG5vIGxvbmdlciB0aGUgbGF5b3V0IHJvb3QuCisgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgCisgICAgLy8gVGhpcyBpbmRpY2F0ZXMgYSBmYWlsdXJl IHRvIGxheW91dCB0aGUgY2hpbGQsIHdoaWNoIGlzIHdoeQorICAgIC8vIHRoZSBsYXlvdXQgcm9v dCBpcyBzdGlsbCBzZXQgdG8gfHRoaXN8LiBNYWtlIHN1cmUgdG8gY2xlYXIgaXQKKyAgICAvLyBz aW5jZSB3ZSBhcmUgZ2V0dGluZyBkZXN0cm95ZWQuCisgICAgdmlldygpLmZyYW1lVmlldygpLmNs ZWFyTGF5b3V0Um9vdCgpOworfQorCiB2b2lkIFJlbmRlckVsZW1lbnQ6OndpbGxCZURlc3Ryb3ll ZCgpCiB7CiAgICAgYW5pbWF0aW9uKCkuY2FuY2VsQW5pbWF0aW9ucygqdGhpcyk7CkBAIC0xMDkz LDYgKzExMTEsNyBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OndpbGxCZURlc3Ryb3llZCgpCiAgICAg ICAgIH0KICAgICB9CiAjZW5kaWYKKyAgICBjbGVhckxheW91dFJvb3RJZk5lZWRlZCgpOwogfQog CiB2b2lkIFJlbmRlckVsZW1lbnQ6OnNldE5lZWRzUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0KGNv bnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RWxlbWVudC5oCmluZGV4IDVmNmM3M2IyYmJkNzRjNjFjNDA3ZTA5ZjQ0YjIxZGQ3NTU4OTJmYTMu LmVmMzdhYWE3NmUzYWExODRhYTFkZjc1MTgzNjBlZGI4NDg3ODM0NGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMjk4LDYgKzI5OCw4IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBnZXRMZWFkaW5nQ29ybmVyKEZsb2F0UG9pbnQmIG91dHB1dCkgY29uc3Q7CiAg ICAgYm9vbCBnZXRUcmFpbGluZ0Nvcm5lcihGbG9hdFBvaW50JiBvdXRwdXQpIGNvbnN0OwogCisg ICAgdm9pZCBjbGVhckxheW91dFJvb3RJZk5lZWRlZCgpIGNvbnN0OworCiAgICAgdW5zaWduZWQg bV9iYXNlVHlwZUZsYWdzIDogNjsKICAgICB1bnNpZ25lZCBtX2FuY2VzdG9yTGluZUJveERpcnR5 IDogMTsKICAgICB1bnNpZ25lZCBtX2hhc0luaXRpYWxpemVkU3R5bGUgOiAxOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCBhZTY0MWE0OGFmNjYwN2NjZTI1 ZmIwZTBmYWY3NzcxMzRkZGQwNGIwLi4wMGMyZmI0YzMzZmU4MTJlZTliMzMzNmYxN2Y4NmMxMTFk YzRmZTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAt MTg3NiwyMCArMTg3Niw2IEBAIGJvb2wgUmVuZGVyT2JqZWN0Ojppc1NlbGVjdGlvbkJvcmRlcigp IGNvbnN0CiAgICAgICAgIHx8IHZpZXcoKS5zZWxlY3Rpb25VbnNwbGl0RW5kKCkgPT0gdGhpczsK IH0KIAotaW5saW5lIHZvaWQgUmVuZGVyT2JqZWN0OjpjbGVhckxheW91dFJvb3RJZk5lZWRlZCgp IGNvbnN0Ci17Ci0gICAgaWYgKGRvY3VtZW50QmVpbmdEZXN0cm95ZWQoKSkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgaWYgKHZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRSb290KCkgPT0gdGhpcykg ewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgLy8gVGhpcyBpbmRpY2F0 ZXMgYSBmYWlsdXJlIHRvIGxheW91dCB0aGUgY2hpbGQsIHdoaWNoIGlzIHdoeQotICAgICAgICAv LyB0aGUgbGF5b3V0IHJvb3QgaXMgc3RpbGwgc2V0IHRvIHx0aGlzfC4gTWFrZSBzdXJlIHRvIGNs ZWFyIGl0Ci0gICAgICAgIC8vIHNpbmNlIHdlIGFyZSBnZXR0aW5nIGRlc3Ryb3llZC4KLSAgICAg ICAgdmlldygpLmZyYW1lVmlldygpLmNsZWFyTGF5b3V0Um9vdCgpOwotICAgIH0KLX0KLQogdm9p ZCBSZW5kZXJPYmplY3Q6OndpbGxCZURlc3Ryb3llZCgpCiB7CiAgICAgLy8gRm9yIGFjY2Vzc2li aWxpdHkgbWFuYWdlbWVudCwgbm90aWZ5IHRoZSBwYXJlbnQgb2YgdGhlIGltbWluZW50IGNoYW5n ZSB0byBpdHMgY2hpbGQgc2V0LgpAQCAtMTkxMyw3ICsxODk5LDYgQEAgdm9pZCBSZW5kZXJPYmpl Y3Q6OndpbGxCZURlc3Ryb3llZCgpCiAgICAgICAgIGRvd25jYXN0PFJlbmRlckxheWVyTW9kZWxP YmplY3Q+KCp0aGlzKS5kZXN0cm95TGF5ZXIoKTsKICAgICB9CiAKLSAgICBjbGVhckxheW91dFJv b3RJZk5lZWRlZCgpOwogICAgIHJlbW92ZVJhcmVEYXRhKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaAppbmRleCBmNWNkMzU1ZmZjNGQ4N2MwYTZjYTBjYjhiYTI5 Mjk1MjA3MTA5ODYwLi45YjBlMGZmOWIyZjVmMmIxYzY1ZTQzM2UxZTNiNTk5N2UzZDRlZGRjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC04NjYsNyArODY2LDYg QEAgcHJvdGVjdGVkOgogCiAgICAgdm9pZCBhZGp1c3RSZWN0Rm9yT3V0bGluZUFuZFNoYWRvdyhM YXlvdXRSZWN0JikgY29uc3Q7CiAKLSAgICB2b2lkIGNsZWFyTGF5b3V0Um9vdElmTmVlZGVkKCkg Y29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIHdpbGxCZURlc3Ryb3llZCgpOwogCiAgICAgdmlydHVh bCB2b2lkIGluc2VydGVkSW50b1RyZWUoKTsK 258303 2015-08-05 15:01:28 -0700 2015-08-07 14:25:50 -0700 Patch bug-147694-20150805150120.patch text/plain 8567 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTY4M2NlOWZhNzZiNDll NjRkOGZlOGNlYzgwY2JmMDEzZmVkMzBhOC4uNGEwY2M2MzA1N2U0ZWJiZTE3ZDA1ODg0ZDJkYTI2 NzY4YjM2YzRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE1LTA4LTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3VidHJlZSBsYXlvdXQgY29k ZSBzaG91bGQgdXNlIFJlbmRlckVsZW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc2OTQKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBG cmFzZXIuCisKKyAgICAgICAgU3VidHJlZSBsYXlvdXQgd2lsbCBuZXZlciBiZWdpbiBhdCBhIFJl bmRlclRleHQsIHNvIHRpZ2h0ZW4gdXAKKyAgICAgICAgdGhlIGNvZGUgdG8gb3BlcmF0ZSBvbiBS ZW5kZXJFbGVtZW50cyBpbnN0ZWFkIG9mIFJlbmRlck9iamVjdHMuCisgICAgICAgIChUaGlzIHBh dGNoIGlzIGJhc2VkIG9uIHdlYmtpdC5vcmcvYi8xMjY4NzgpCisKKyAgICAgICAgTm8gY2hhbmdl IGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3 aWxsTGF5b3V0KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OkZyYW1lVmlldyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OmxheW91dFJvb3QpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3 Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvbik6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVu dDo6Y2xlYXJMYXlvdXRSb290SWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxl bWVudDo6d2lsbEJlRGVzdHJveWVkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVu dC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyT2JqZWN0OjpjbGVhckxheW91dFJvb3RJZk5lZWRlZCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OndpbGxCZURlc3Ryb3llZCk6IERlbGV0ZWQu CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorCiAyMDE1LTA4LTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBE YXRhYmFzZUJhY2tlbmQgYXMgYW5vdGhlciBzdGVwIHRvd2FyZHMgbWVyZ2luZyBEYXRhYmFzZSBh bmQgRGF0YWJhc2VCYWNrZW5kQmFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4IDlkNzIzMGYxYmFmY2FiNTM0ZDQ5ZGJh Y2YzNWNkYzdkNzZjMTg0ZGUuLmUxMjBiOTQwZDQ3OWVjYTljZTU3MzBhMmM5YzE0MGZhMDkzY2Ez ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGlu ZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5jcHAKQEAgLTM0OSw3ICszNDksNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZEludmFsaWRhdGVMYXlvdXQoRnJhbWUmIGZyYW1lKQogCiB2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OndpbGxMYXlvdXQoRnJhbWUmIGZyYW1lKQogewotICAgIFJlbmRlck9iamVj dCogcm9vdCA9IGZyYW1lLnZpZXcoKS0+bGF5b3V0Um9vdCgpOworICAgIGF1dG8qIHJvb3QgPSBm cmFtZS52aWV3KCktPmxheW91dFJvb3QoKTsKICAgICBib29sIHBhcnRpYWxMYXlvdXQgPSAhIXJv b3Q7CiAKICAgICBpZiAoIXBhcnRpYWxMYXlvdXQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAK aW5kZXggMzA1NmUzM2I2ZjU0MWFlMGIxYmFhMTBkNGUxYjk4ZTY1NWJmNmEzNC4uYmYyZTZjNzFj ZTRmYmIwODU0NjEzYWJhMTBhYzcyZjQ0MGQxNDljNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcApAQCAtMTY0LDcgKzE2NCw2IEBAIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1lJiBmcmFt ZSkKICAgICA6IG1fZnJhbWUoZnJhbWUpCiAgICAgLCBtX2NhbkhhdmVTY3JvbGxiYXJzKHRydWUp CiAgICAgLCBtX2xheW91dFRpbWVyKCp0aGlzLCAmRnJhbWVWaWV3OjpsYXlvdXRUaW1lckZpcmVk KQotICAgICwgbV9sYXlvdXRSb290KG51bGxwdHIpCiAgICAgLCBtX2xheW91dFBoYXNlKE91dHNp ZGVMYXlvdXQpCiAgICAgLCBtX2luU3luY2hyb25vdXNQb3N0TGF5b3V0KGZhbHNlKQogICAgICwg bV9wb3N0TGF5b3V0VGFza3NUaW1lcigqdGhpcywgJkZyYW1lVmlldzo6cGVyZm9ybVBvc3RMYXlv dXRUYXNrcykKQEAgLTExMjksMTEgKzExMjgsNiBAQCB2b2lkIEZyYW1lVmlldzo6c2V0SXNJbldp bmRvdyhib29sIGlzSW5XaW5kb3cpCiAgICAgICAgIHJlbmRlclZpZXctPnNldElzSW5XaW5kb3co aXNJbldpbmRvdyk7CiB9CiAKLVJlbmRlck9iamVjdCogRnJhbWVWaWV3OjpsYXlvdXRSb290KGJv b2wgb25seUR1cmluZ0xheW91dCkgY29uc3QKLXsKLSAgICByZXR1cm4gb25seUR1cmluZ0xheW91 dCAmJiBsYXlvdXRQZW5kaW5nKCkgPyBudWxscHRyIDogbV9sYXlvdXRSb290OwotfQotCiBpbmxp bmUgdm9pZCBGcmFtZVZpZXc6OmZvcmNlTGF5b3V0UGFyZW50Vmlld0lmTmVlZGVkKCkKIHsKICAg ICBSZW5kZXJXaWRnZXQqIG93bmVyUmVuZGVyZXIgPSBmcmFtZSgpLm93bmVyUmVuZGVyZXIoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IGY1MmY5ZWE2OGNmYTM5NGQ5YWE3YTI3YmE3OTVh M2M4ODRlNmM0MDMuLmJjNGViNjk0YzQ4MTFhZTdhMjQxNGI1ZmE5ZDMwNzFmMDUyMDhlMDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICBi b29sIGlzSW5MYXlvdXQoKSBjb25zdCB7IHJldHVybiBtX2xheW91dFBoYXNlID09IEluTGF5b3V0 OyB9CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpblBhaW50YWJsZVN0YXRlKCkgeyByZXR1cm4g bV9sYXlvdXRQaGFzZSAhPSBJbkxheW91dCAmJiBtX2xheW91dFBoYXNlICE9IEluVmlld1NpemVB ZGp1c3QgJiYgbV9sYXlvdXRQaGFzZSAhPSBJblBvc3RMYXlvdXQ7IH0KIAotICAgIFJlbmRlck9i amVjdCogbGF5b3V0Um9vdChib29sIG9ubHlEdXJpbmdMYXlvdXQgPSBmYWxzZSkgY29uc3Q7Cisg ICAgUmVuZGVyRWxlbWVudCogbGF5b3V0Um9vdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0Um9v dDsgfQogICAgIHZvaWQgY2xlYXJMYXlvdXRSb290KCkgeyBtX2xheW91dFJvb3QgPSBudWxscHRy OyB9CiAgICAgaW50IGxheW91dENvdW50KCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRDb3VudDsg fQogCkBAIC02OTYsNyArNjk2LDcgQEAgcHJpdmF0ZToKIAogICAgIFRpbWVyIG1fbGF5b3V0VGlt ZXI7CiAgICAgYm9vbCBtX2RlbGF5ZWRMYXlvdXQ7Ci0gICAgUmVuZGVyRWxlbWVudCogbV9sYXlv dXRSb290OworICAgIFJlbmRlckVsZW1lbnQqIG1fbGF5b3V0Um9vdCB7IG51bGxwdHIgfTsKIAog ICAgIExheW91dFBoYXNlIG1fbGF5b3V0UGhhc2U7CiAgICAgYm9vbCBtX2xheW91dFNjaGVkdWxp bmdFbmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCAzZTg2 Y2M2ODllNGI0ZjYyZTIyMjJmY2U2MTIxYWViMmVhYzYyOThlLi5hYTk3ZGFmYTM0MDVlY2MxYTBk ZTAxOThiMzNmZTlmZTgyOTY1NjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmNwcApAQCAtMjM0Nyw3ICsyMzQ3LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2Fs V2lkdGhJblJlZ2lvbihMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGUKICAgICB9 CiAKICAgICAvLyBJZiBsYXlvdXQgaXMgbGltaXRlZCB0byBhIHN1YnRyZWUsIHRoZSBzdWJ0cmVl IHJvb3QncyBsb2dpY2FsIHdpZHRoIGRvZXMgbm90IGNoYW5nZS4KLSAgICBpZiAoZWxlbWVudCgp ICYmIHZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRSb290KHRydWUpID09IHRoaXMpCisgICAgaWYg KGVsZW1lbnQoKSAmJiAhdmlldygpLmZyYW1lVmlldygpLmxheW91dFBlbmRpbmcoKSAmJiB2aWV3 KCkuZnJhbWVWaWV3KCkubGF5b3V0Um9vdCgpID09IHRoaXMpCiAgICAgICAgIHJldHVybjsKIAog ICAgIC8vIFRoZSBwYXJlbnQgYm94IGlzIGZsZXhpbmcgdXMsIHNvIGl0IGhhcyBpbmNyZWFzZWQg b3IgZGVjcmVhc2VkIG91cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu Y3BwCmluZGV4IDUwZjhhM2U1YzcxZTVhMjUzNTZkYWE0ZGU5NGYwMmQyMzFiYjAzNzEuLmIzMDlm NzdlNGFjMTQ4YmU2MzY5ODE3NWRlNzU4ZWExYWJlZTgyMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTEwNzMsNiArMTA3MywyNCBAQCB2b2lkIFJl bmRlckVsZW1lbnQ6OndpbGxCZVJlbW92ZWRGcm9tVHJlZSgpCiAgICAgUmVuZGVyT2JqZWN0Ojp3 aWxsQmVSZW1vdmVkRnJvbVRyZWUoKTsKIH0KIAoraW5saW5lIHZvaWQgUmVuZGVyRWxlbWVudDo6 Y2xlYXJMYXlvdXRSb290SWZOZWVkZWQoKSBjb25zdAoreworICAgIGlmIChkb2N1bWVudEJlaW5n RGVzdHJveWVkKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICh2aWV3KCkuZnJhbWVWaWV3 KCkubGF5b3V0Um9vdCgpICE9IHRoaXMpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIE5vcm1h bGx5IHdoZW4gYSByZW5kZXJlciBpcyBkZXRhY2hlZCBmcm9tIHRoZSB0cmVlLCB0aGUgYXBwcm9w cmlhdGUgZGlydHkgYml0cyBnZXQgc2V0CisgICAgLy8gd2hpY2ggZW5zdXJlcyB0aGF0IHRoaXMg cmVuZGVyZXIgaXMgbm8gbG9uZ2VyIHRoZSBsYXlvdXQgcm9vdC4KKyAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICAKKyAgICAvLyBUaGlzIGluZGljYXRlcyBhIGZhaWx1cmUgdG8gbGF5b3V0 IHRoZSBjaGlsZCwgd2hpY2ggaXMgd2h5CisgICAgLy8gdGhlIGxheW91dCByb290IGlzIHN0aWxs IHNldCB0byB8dGhpc3wuIE1ha2Ugc3VyZSB0byBjbGVhciBpdAorICAgIC8vIHNpbmNlIHdlIGFy ZSBnZXR0aW5nIGRlc3Ryb3llZC4KKyAgICB2aWV3KCkuZnJhbWVWaWV3KCkuY2xlYXJMYXlvdXRS b290KCk7Cit9CisKIHZvaWQgUmVuZGVyRWxlbWVudDo6d2lsbEJlRGVzdHJveWVkKCkKIHsKICAg ICBhbmltYXRpb24oKS5jYW5jZWxBbmltYXRpb25zKCp0aGlzKTsKQEAgLTEwOTMsNiArMTExMSw3 IEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6d2lsbEJlRGVzdHJveWVkKCkKICAgICAgICAgfQogICAg IH0KICNlbmRpZgorICAgIGNsZWFyTGF5b3V0Um9vdElmTmVlZGVkKCk7CiB9CiAKIHZvaWQgUmVu ZGVyRWxlbWVudDo6c2V0TmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXQoY29uc3QgUmVuZGVy U3R5bGUqIG9sZFN0eWxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgK aW5kZXggNWY2YzczYjJiYmQ3NGM2MWM0MDdlMDlmNDRiMjFkZDc1NTg5MmZhMy4uZWYzN2FhYTc2 ZTNhYTE4NGFhMWRmNzUxODM2MGVkYjg0ODc4MzQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5oCkBAIC0yOTgsNiArMjk4LDggQEAgcHJpdmF0ZToKICAgICBib29s IGdldExlYWRpbmdDb3JuZXIoRmxvYXRQb2ludCYgb3V0cHV0KSBjb25zdDsKICAgICBib29sIGdl dFRyYWlsaW5nQ29ybmVyKEZsb2F0UG9pbnQmIG91dHB1dCkgY29uc3Q7CiAKKyAgICB2b2lkIGNs ZWFyTGF5b3V0Um9vdElmTmVlZGVkKCkgY29uc3Q7CisKICAgICB1bnNpZ25lZCBtX2Jhc2VUeXBl RmxhZ3MgOiA2OwogICAgIHVuc2lnbmVkIG1fYW5jZXN0b3JMaW5lQm94RGlydHkgOiAxOwogICAg IHVuc2lnbmVkIG1faGFzSW5pdGlhbGl6ZWRTdHlsZSA6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IGFlNjQxYTQ4YWY2NjA3Y2NlMjVmYjBlMGZhZjc3 NzEzNGRkZDA0YjAuLjAwYzJmYjRjMzNmZTgxMmVlOWIzMzM2ZjE3Zjg2YzExMWRjNGZlODAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xODc2LDIwICsx ODc2LDYgQEAgYm9vbCBSZW5kZXJPYmplY3Q6OmlzU2VsZWN0aW9uQm9yZGVyKCkgY29uc3QKICAg ICAgICAgfHwgdmlldygpLnNlbGVjdGlvblVuc3BsaXRFbmQoKSA9PSB0aGlzOwogfQogCi1pbmxp bmUgdm9pZCBSZW5kZXJPYmplY3Q6OmNsZWFyTGF5b3V0Um9vdElmTmVlZGVkKCkgY29uc3QKLXsK LSAgICBpZiAoZG9jdW1lbnRCZWluZ0Rlc3Ryb3llZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBpZiAodmlldygpLmZyYW1lVmlldygpLmxheW91dFJvb3QoKSA9PSB0aGlzKSB7Ci0gICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAvLyBUaGlzIGluZGljYXRlcyBhIGZhaWx1 cmUgdG8gbGF5b3V0IHRoZSBjaGlsZCwgd2hpY2ggaXMgd2h5Ci0gICAgICAgIC8vIHRoZSBsYXlv dXQgcm9vdCBpcyBzdGlsbCBzZXQgdG8gfHRoaXN8LiBNYWtlIHN1cmUgdG8gY2xlYXIgaXQKLSAg ICAgICAgLy8gc2luY2Ugd2UgYXJlIGdldHRpbmcgZGVzdHJveWVkLgotICAgICAgICB2aWV3KCku ZnJhbWVWaWV3KCkuY2xlYXJMYXlvdXRSb290KCk7Ci0gICAgfQotfQotCiB2b2lkIFJlbmRlck9i amVjdDo6d2lsbEJlRGVzdHJveWVkKCkKIHsKICAgICAvLyBGb3IgYWNjZXNzaWJpbGl0eSBtYW5h Z2VtZW50LCBub3RpZnkgdGhlIHBhcmVudCBvZiB0aGUgaW1taW5lbnQgY2hhbmdlIHRvIGl0cyBj aGlsZCBzZXQuCkBAIC0xOTEzLDcgKzE4OTksNiBAQCB2b2lkIFJlbmRlck9iamVjdDo6d2lsbEJl RGVzdHJveWVkKCkKICAgICAgICAgZG93bmNhc3Q8UmVuZGVyTGF5ZXJNb2RlbE9iamVjdD4oKnRo aXMpLmRlc3Ryb3lMYXllcigpOwogICAgIH0KIAotICAgIGNsZWFyTGF5b3V0Um9vdElmTmVlZGVk KCk7CiAgICAgcmVtb3ZlUmFyZURhdGEoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5oCmluZGV4IGY1Y2QzNTVmZmM0ZDg3YzBhNmNhMGNiOGJhMjkyOTUyMDcxMDk4 NjAuLjliMGUwZmY5YjJmNWYyYjFjNjVlNDMzZTFlM2I1OTk3ZTNkNGVkZGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTg2Niw3ICs4NjYsNiBAQCBwcm90ZWN0 ZWQ6CiAKICAgICB2b2lkIGFkanVzdFJlY3RGb3JPdXRsaW5lQW5kU2hhZG93KExheW91dFJlY3Qm KSBjb25zdDsKIAotICAgIHZvaWQgY2xlYXJMYXlvdXRSb290SWZOZWVkZWQoKSBjb25zdDsKICAg ICB2aXJ0dWFsIHZvaWQgd2lsbEJlRGVzdHJveWVkKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgaW5z ZXJ0ZWRJbnRvVHJlZSgpOwo=