145852 2015-06-10 13:09:32 -0700 Disable UIWindow for fullscreen video for selected clients. 2015-06-19 12:41:18 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson jer.noble oldest_to_newest 1101090 0 jeremyj-wk 2015-06-10 13:09:32 -0700 Disable UIWindow for fullscreen video for selected clients. 1101092 1 254671 jeremyj-wk 2015-06-10 13:20:45 -0700 Created attachment 254671 Patch 1101093 2 jeremyj-wk 2015-06-10 13:21:44 -0700 rdar://problem/21325340 1103052 3 jeremyj-wk 2015-06-18 15:26:16 -0700 Use -[UIWindow _isHostedInAnotherProcess] to detect being in a view service and remove growing list of bundle identifier checks. 1103054 4 255140 jeremyj-wk 2015-06-18 15:27:27 -0700 Created attachment 255140 Patch for landing. 1103099 5 255140 commit-queue 2015-06-18 17:14:06 -0700 Comment on attachment 255140 Patch for landing. Rejecting attachment 255140 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 255140, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: d83800c6e218db169d6b5a03f64a7adfd1d r185725 = 639e26bcc11ef8ee30f050f0f4a482859367e483 r185726 = 1a759b8d8a124ed1dc22df1a3cd91e9582578ec2 r185727 = 92313237a681dcd39ad022f0f1b32e6db1562088 r185728 = ea361c1fb59d6470e7b3e6da359ce3a4b5db61a8 r185729 = 1cb8e15d3ff6326e79ac5ba13b1e0f265a2af584 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.appspot.com/results/5674861896663040 1103132 6 255164 jeremyj-wk 2015-06-18 19:27:21 -0700 Created attachment 255164 Patch for landing. 1103145 7 255164 commit-queue 2015-06-18 20:46:49 -0700 Comment on attachment 255164 Patch for landing. Clearing flags on attachment: 255164 Committed r185733: <http://trac.webkit.org/changeset/185733> 1103268 8 255164 darin 2015-06-19 10:14:24 -0700 Comment on attachment 255164 Patch for landing. View in context: https://bugs.webkit.org/attachment.cgi?id=255164&action=review > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:881 > +@interface UIWindow () > +-(BOOL)_isHostedInAnotherProcess; > +@end I think we have a new best practice for this sort of thing that involves a header file with a name that ends in “SPI.h”. 1103314 9 jeremyj-wk 2015-06-19 11:21:22 -0700 (In reply to comment #8) > Comment on attachment 255164 [details] > Patch for landing. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255164&action=review > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:881 > > +@interface UIWindow () > > +-(BOOL)_isHostedInAnotherProcess; > > +@end > > I think we have a new best practice for this sort of thing that involves a > header file with a name that ends in “SPI.h”. Noted. This will go away when we complete rdar://problem/19708648 In the mean time I've filed https://bugs.webkit.org/show_bug.cgi?id=146151 to cover this request. 254671 2015-06-10 13:20:45 -0700 2015-06-11 14:32:43 -0700 Patch bug-145852-20150610132017.patch text/plain 10021 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjljYzA4MmY3M2IyYWM0 ZjRkMzQ5NWQxZDE4NmU2NmFhOTg0ZWJmZS4uYzE5ZTkxMzA5NDg3NjEwYWNiOTk5ZTdhNjc3NTY3 YTVmODhkNDJmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA2LTEwICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBEaXNhYmxlIFVJV2luZG93 IGZvciBmdWxsc2NyZWVuIHZpZGVvIGZvciBzZWxlY3RlZCBjbGllbnRzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1ODUyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGlzYWJsZSBVSVdpbmRvdyBmb3Ig ZnVsbHNjcmVlbiB2aWRlbyBkb2Vzbid0IHdvcmsgZXZlcnl3aGVyZSAocmRhcjovL3Byb2JsZW0v MjEzMTU5OTMpLCBzbyBqdXN0IGRpc2FibGUgaXQgZm9yIHN1cHBvcnRlZCBjbGllbnRzLgorICAg ICAgICBGaXggc29tZSBpbnRlcmZhY2UgaGlkaW5nIGFuZCBsYXlvdXQgcHJvYmxlbXMgdGhhdCBz aG93ZWQgdXAgaW4gdGhlIG5vbiBVSVdpbmRvdyBjb2RlIHBhdGguCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9S dW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MubW06IEFkZCBzb21lIG5ldyBidW5kbGUgaWRlbnRp ZmllciBjaGVja3MuCisgICAgICAgIChXZWJDb3JlOjphcHBsaWNhdGlvbklzU2FmYXJpVmlld1Nl cnZpY2UpOiBBZGRlZAorICAgICAgICAoV2ViQ29yZTo6YXBwbGljYXRpb25Jc1dlYlZpZXdTZXJ2 aWNlKTogQWRkZWQKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQubW06CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dDo6c2V0dXBGdWxsc2NyZWVuKTogTW9yZSB0aGluZ3Mgb3B0LW91dCBvZiBVSVdpbmRvdy4gQW5k IGZpeCB2aWV3IHBhcmVudGluZyBmb3Igbm9uLXdpbmRvdyBjYXNlLgorICAgICAgICAoV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKTogRml4IGZvciBBVktp dCBleGl0IGZ1bGxzY3JlZW4gY29tcGxhaW5pbmcgYWJvdXQgLW5lZWRzTGF5b3V0LgorCisgICAg ICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6cmVxdWVzdEhpZGVBbmRFeGl0 RnVsbHNjcmVlbik6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 cHJlcGFyZWRUb1JldHVyblRvSW5saW5lKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0Ojp3aWxsU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKToKKyAgICAgICAgKFdl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdGFydE9wdGltaXplZEZ1bGxzY3Jl ZW4pOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdG9w T3B0aW1pemVkRnVsbHNjcmVlbik6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdDo6ZGlkU3RvcE9wdGltaXplZEZ1bGxzY3JlZW4pOgorICAgICAgICBUaGVzZSBoaWRl IGFuZCBzaG93IHRoZSB2aWV3IGNvbnRyb2xsZXIgd2hlcmUgd2UgaGlkZSBhbmQgc2hvdyB0aGUg d2luZG93LgorCiAyMDE1LTA2LTA0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBs ZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBDbGVhbiB1cCBtX2ZvbnQgaW5zaWRlIEZvbnRQbGF0 Zm9ybURhdGEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBs aWNhdGlvbkNoZWNrc0lPUy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxp Y2F0aW9uQ2hlY2tzSU9TLmgKaW5kZXggMzQ2Yzc1NmMzNDcwZDIwMWUzYzVjMTYyMTRjYTRkZjgy ZDVlNWI2NS4uZjE3MGFkODk5MWVmNDI4NjM3MWNiYjIxOGYxNDYyZGU3Nzk4MDY2MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzSU9T LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tz SU9TLmgKQEAgLTMwLDYgKzMwLDggQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogYm9vbCBhcHBs aWNhdGlvbklzQWRTaGVldCgpOworYm9vbCBhcHBsaWNhdGlvbklzU2FmYXJpVmlld1NlcnZpY2Uo KTsKK2Jvb2wgYXBwbGljYXRpb25Jc1dlYlZpZXdTZXJ2aWNlKCk7CiBXRUJDT1JFX0VYUE9SVCBi b29sIGFwcGxpY2F0aW9uSXNNb2JpbGVNYWlsKCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGFwcGxp Y2F0aW9uSXNNb2JpbGVTYWZhcmkoKTsKIGJvb2wgYXBwbGljYXRpb25Jc0R1bXBSZW5kZXJUcmVl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRp b25DaGVja3NJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRp b25DaGVja3NJT1MubW0KaW5kZXggY2FhZWU4Nzg3NjcyMGViMWQ5YzBlNWI5NmM0MDYxYjlhNTFj ODJhYy4uMWVlZDExYjNiMmM1NzVmZGZhOTNiYTE1MTY5N2RlY2RkYjY3ODNhZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzSU9TLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrc0lP Uy5tbQpAQCAtMzcsNiArMzcsMTggQEAgYm9vbCBhcHBsaWNhdGlvbklzQWRTaGVldCgpCiAgICAg cmV0dXJuIGlzQWRTaGVldDsKIH0KIAorYm9vbCBhcHBsaWNhdGlvbklzU2FmYXJpVmlld1NlcnZp Y2UoKQoreworICAgIHN0YXRpYyBjb25zdCBib29sIGlzU2FmYXJpVmlld1NlcnZpY2UgPSBbW1tO U0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXSBpc0VxdWFsVG9TdHJpbmc6QCJj b20uYXBwbGUuU2FmYXJpVmlld1NlcnZpY2UiXTsKKyAgICByZXR1cm4gaXNTYWZhcmlWaWV3U2Vy dmljZTsKK30KKworYm9vbCBhcHBsaWNhdGlvbklzV2ViVmlld1NlcnZpY2UoKQoreworICAgIHN0 YXRpYyBjb25zdCBib29sIGlzV2ViVmlld1NlcnZpY2UgPSBbW1tOU0J1bmRsZSBtYWluQnVuZGxl XSBidW5kbGVJZGVudGlmaWVyXSBpc0VxdWFsVG9TdHJpbmc6QCJjb20uYXBwbGUuV2ViVmlld1Nl cnZpY2UiXTsKKyAgICByZXR1cm4gaXNXZWJWaWV3U2VydmljZTsKK30KKwogYm9vbCBhcHBsaWNh dGlvbklzTW9iaWxlTWFpbCgpCiB7CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgaXNNb2JpbGVNYWls ID0gW1tbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl0gaXNFcXVhbFRvU3Ry aW5nOkAiY29tLmFwcGxlLm1vYmlsZW1haWwiXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5t bQppbmRleCBjNGE0OTdmNTZiZTgzOTlkNDcxNjBjNDQwMDUzYzAzN2Y3OGQxNDhkLi4wYWU3NTc2 NGQ4ZDQzMDcwOTJiNjljZWM2ZDkxY2M5NDQyNWMxNWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUFWS2l0Lm1tCkBAIC04OTAsNyArODkwLDcgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdDo6c2V0dXBGdWxsc2NyZWVuKFBsYXRmb3JtTGF5ZXImIHZpZGVvTGF5ZXIKICAg ICBtX3BhcmVudFZpZXcgPSBwYXJlbnRWaWV3OwogICAgIG1fcGFyZW50V2luZG93ID0gcGFyZW50 Vmlldy53aW5kb3c7CiAKLSAgICBpZiAoIWFwcGxpY2F0aW9uSXNBZFNoZWV0KCkpIHsKKyAgICBp ZiAoIWFwcGxpY2F0aW9uSXNBZFNoZWV0KCkgJiYgIWFwcGxpY2F0aW9uSXNNb2JpbGVTYWZhcmko KSAmJiAhYXBwbGljYXRpb25Jc1dlYlZpZXdTZXJ2aWNlKCkgJiYgIWFwcGxpY2F0aW9uSXNTYWZh cmlWaWV3U2VydmljZSgpKSB7CiAgICAgICAgIG1fd2luZG93ID0gYWRvcHROUyhbYWxsb2NVSVdp bmRvd0luc3RhbmNlKCkgaW5pdFdpdGhGcmFtZTpbW2dldFVJU2NyZWVuQ2xhc3MoKSBtYWluU2Ny ZWVuXSBib3VuZHNdXSk7CiAgICAgICAgIFttX3dpbmRvdyBzZXRCYWNrZ3JvdW5kQ29sb3I6W2dl dFVJQ29sb3JDbGFzcygpIGNsZWFyQ29sb3JdXTsKICAgICAgICAgbV92aWV3Q29udHJvbGxlciA9 IGFkb3B0TlMoW2FsbG9jVUlWaWV3Q29udHJvbGxlckluc3RhbmNlKCkgaW5pdF0pOwpAQCAtOTI2 LDExICs5MjYsMTAgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0 dXBGdWxsc2NyZWVuKFBsYXRmb3JtTGF5ZXImIHZpZGVvTGF5ZXIKICAgICBpZiAobV92aWV3Q29u dHJvbGxlcikgewogICAgICAgICBbbV92aWV3Q29udHJvbGxlciBhZGRDaGlsZFZpZXdDb250cm9s bGVyOm1fcGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCldOwogICAgICAgICBbW21fdmlld0NvbnRy b2xsZXIgdmlld10gYWRkU3VidmlldzpbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XV07Ci0g ICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddLmZyYW1lID0gW3BhcmVudFZpZXcg Y29udmVydFJlY3Q6aW5pdGlhbFJlY3QgdG9WaWV3Om5pbF07Ci0gICAgfSBlbHNlIHsKLSAgICAg ICAgW3BhcmVudFZpZXcgYWRkU3VidmlldzpbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XV07 Ci0gICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddLmZyYW1lID0gaW5pdGlhbFJl Y3Q7Ci0gICAgfQorICAgIH0gZWxzZQorICAgICAgICBbcGFyZW50Vmlldy53aW5kb3cgYWRkU3Vi dmlldzpbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XV07CisKKyAgICBbbV9wbGF5ZXJWaWV3 Q29udHJvbGxlciB2aWV3XS5mcmFtZSA9IFtwYXJlbnRWaWV3IGNvbnZlcnRSZWN0OmluaXRpYWxS ZWN0IHRvVmlldzpuaWxdOwogCiAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNl dEJhY2tncm91bmRDb2xvcjpbZ2V0VUlDb2xvckNsYXNzKCkgY2xlYXJDb2xvcl1dOwogICAgIFtb bV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXROZWVkc0xheW91dF07CkBAIC05OTQsMjcg Kzk5MywyNiBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVs bHNjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBmaQogICAgIAogICAgIExPRyhGdWxsc2Ny ZWVuLCAiV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKCVw KSIsIHRoaXMpOwogICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHNldFNob3dzUGxheWJhY2tD b250cm9sczpOT107Ci0gICAgaWYgKG1fdmlld0NvbnRyb2xsZXIpCi0gICAgICAgIFttX3BsYXll clZpZXdDb250cm9sbGVyIHZpZXddLmZyYW1lID0gW21fcGFyZW50VmlldyBjb252ZXJ0UmVjdDpm aW5hbFJlY3QgdG9WaWV3Om5pbF07Ci0gICAgZWxzZQotICAgICAgICBbbV9wbGF5ZXJWaWV3Q29u dHJvbGxlciB2aWV3XS5mcmFtZSA9IGZpbmFsUmVjdDsKKyAgICBbbV9wbGF5ZXJWaWV3Q29udHJv bGxlciB2aWV3XS5mcmFtZSA9IFttX3BhcmVudFZpZXcgY29udmVydFJlY3Q6ZmluYWxSZWN0IHRv VmlldzpuaWxdOwogCiAgICAgaWYgKFttX3ZpZGVvTGF5ZXJDb250YWluZXIgdmlkZW9MYXllckdy YXZpdHldICE9IEFWVmlkZW9MYXllckdyYXZpdHlSZXNpemVBc3BlY3QpCiAgICAgICAgIFttX3Zp ZGVvTGF5ZXJDb250YWluZXIgc2V0VmlkZW9MYXllckdyYXZpdHk6QVZWaWRlb0xheWVyR3Jhdml0 eVJlc2l6ZUFzcGVjdF07CiAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIGxheW91 dElmTmVlZGVkXTsKIAotCiAgICAgaWYgKGlzTW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZp ZGVvRnVsbHNjcmVlbk1vZGVPcHRpbWl6ZWQpKSB7CiAgICAgICAgIFttX3dpbmRvdyBzZXRIaWRk ZW46Tk9dOworICAgICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gc2V0SGlkZGVu Ok5PXTsKICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc3RvcE9wdGltaXplZEZ1bGxz Y3JlZW5dOwogICAgIH0gZWxzZSBpZiAoaXNNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6Vmlk ZW9GdWxsc2NyZWVuTW9kZU9wdGltaXplZCB8IEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9G dWxsc2NyZWVuTW9kZVN0YW5kYXJkKSkgewogICAgICAgICBSZWZQdHI8V2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ+IHN0cm9uZ1RoaXModGhpcyk7CiAgICAgICAgIFttX3BsYXllclZp ZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Tk8gY29tcGxldGlvbkhhbmRsZXI6 W3N0cm9uZ1RoaXMsIHRoaXNdIChCT09MLCBOU0Vycm9yKikgewogICAgICAgICAgICAgW21fd2lu ZG93IHNldEhpZGRlbjpOT107CisgICAgICAgICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIg dmlld10gc2V0SGlkZGVuOk5PXTsKICAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVy IHN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuXTsKICAgICAgICAgfV07CiAgICAgfSBlbHNlIGlmIChp c01vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3RhbmRhcmQp KSB7CiAgICAgICAgIFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdD4gc3Ry b25nVGhpcyh0aGlzKTsKKyAgICAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIGxh eW91dElmTmVlZGVkXTsKICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgZXhpdEZ1bGxT Y3JlZW5BbmltYXRlZDpZRVMgY29tcGxldGlvbkhhbmRsZXI6W3N0cm9uZ1RoaXMsIHRoaXNdIChC T09MLCBOU0Vycm9yKikgewogICAgICAgICAgICAgbV9leGl0Q29tcGxldGVkID0gdHJ1ZTsKIApA QCAtMTEwNSw2ICsxMTAzLDcgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dDo6cmVxdWVzdEhpZGVBbmRFeGl0RnVsbHNjcmVlbigpCiAgICAgTE9HKEZ1bGxzY3JlZW4sICJX ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6cmVxdWVzdEhpZGVBbmRFeGl0RnVsbHNj cmVlbiglcCkiLCB0aGlzKTsKIAogICAgIFttX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKKyAgICBb W21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gc2V0SGlkZGVuOllFU107CiAKICAgICBpZiAo bV92aWRlb0Z1bGxzY3JlZW5Nb2RlbCAmJiAhbV9leGl0UmVxdWVzdGVkKSB7CiAgICAgICAgIG1f dmlkZW9GdWxsc2NyZWVuTW9kZWwtPnBhdXNlKCk7CkBAIC0xMTE3LDEwICsxMTE2LDcgQEAgdm9p ZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6cHJlcGFyZWRUb1JldHVyblRvSW5s aW5lKGJvb2wgdmlzaWJsZSwgY28KICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0OjpwcmVwYXJlZFRvUmV0dXJuVG9JbmxpbmUoJXApIC0gdmlzaWJs ZSglcykiLCB0aGlzLCBib29sU3RyaW5nKHZpc2libGUpKTsKICAgICBpZiAobV9wcmVwYXJlVG9J bmxpbmVDYWxsYmFjaykgewogICAgICAgICAKLSAgICAgICAgaWYgKG1fdmlld0NvbnRyb2xsZXIp Ci0gICAgICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XS5mcmFtZSA9IFttX3Bh cmVudFZpZXcgY29udmVydFJlY3Q6aW5saW5lUmVjdCB0b1ZpZXc6bmlsXTsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10uZnJhbWUgPSBpbmxp bmVSZWN0OworICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XS5mcmFtZSA9IFtt X3BhcmVudFZpZXcgY29udmVydFJlY3Q6aW5saW5lUmVjdCB0b1ZpZXc6bmlsXTsKIAogICAgICAg ICBzdGQ6OmZ1bmN0aW9uPHZvaWQoYm9vbCk+IGNhbGxiYWNrID0gV1RGOjptb3ZlKG1fcHJlcGFy ZVRvSW5saW5lQ2FsbGJhY2spOwogICAgICAgICBjYWxsYmFjayh2aXNpYmxlKTsKQEAgLTExNTMs NiArMTE0OSw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxT dGFydE9wdGltaXplZEZ1bGxzY3JlZW4oKQogCiAgICAgICAgIGlmICghdmlzaWJsZSkgewogICAg ICAgICAgICAgW21fd2luZG93IHNldEhpZGRlbjpZRVNdOworICAgICAgICAgICAgW1ttX3BsYXll clZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpZRVNdOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAKQEAgLTExNjMsNiArMTE2MCw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdGFydE9wdGltaXplZEZ1bGxzY3JlZW4oKQogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIGNsZWFyTW9kZShIVE1MTWVkaWFFbGVtZW50 RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCk7CiAgICAgICAgICAgICBbbV93aW5k b3cgc2V0SGlkZGVuOllFU107CisgICAgICAgICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIg dmlld10gc2V0SGlkZGVuOllFU107CiAgICAgICAgIH1dOwogICAgIH0pOwogfQpAQCAtMTE3Miw2 ICsxMTcwLDcgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3Rh cnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCkKICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdGFydE9wdGltaXplZEZ1bGxzY3JlZW4oJXApIiwg dGhpcyk7CiAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc2V0U2hvd3NQbGF5YmFja0NvbnRy b2xzOllFU107CiAgICAgW21fd2luZG93IHNldEhpZGRlbjpZRVNdOworICAgIFtbbV9wbGF5ZXJW aWV3Q29udHJvbGxlciB2aWV3XSBzZXRIaWRkZW46WUVTXTsKIAogICAgIGlmIChtX2Z1bGxzY3Jl ZW5DaGFuZ2VPYnNlcnZlcikKICAgICAgICAgbV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXItPmRp ZEVudGVyRnVsbHNjcmVlbigpOwpAQCAtMTE5OCw2ICsxMTk3LDcgQEAgdm9pZCBXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuKCkKIHsK ICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3 aWxsU3RvcE9wdGltaXplZEZ1bGxzY3JlZW4oJXApIiwgdGhpcyk7CiAgICAgW21fd2luZG93IHNl dEhpZGRlbjpOT107CisgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRl bjpOT107CiAKICAgICBpZiAobV92aWRlb0Z1bGxzY3JlZW5Nb2RlbCkKICAgICAgICAgbV92aWRl b0Z1bGxzY3JlZW5Nb2RlbC0+cmVxdWVzdEV4aXRGdWxsc2NyZWVuKCk7CkBAIC0xMjE2LDYgKzEy MTYsNyBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdG9wT3B0 aW1pemVkRnVsbHNjcmVlbigpCiAKICAgICBjbGVhck1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1z OjpWaWRlb0Z1bGxzY3JlZW5Nb2RlT3B0aW1pemVkKTsKICAgICBbbV93aW5kb3cgc2V0SGlkZGVu OllFU107CisgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpZRVNd OwogICAgIAogICAgIGlmIChtX2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlcikKICAgICAgICAgbV9m dWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXItPmRpZEV4aXRGdWxsc2NyZWVuKCk7Cg== 255140 2015-06-18 15:27:27 -0700 2015-06-18 17:14:06 -0700 Patch for landing. bug-145852-20150618152649.patch text/plain 10106 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjljYzA4MmY3M2IyYWM0 ZjRkMzQ5NWQxZDE4NmU2NmFhOTg0ZWJmZS4uNDAwNDBiNGJjNDFhYjM2NWI1YjQxNmYwYmFjNmRi NjRiYzM4NzA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA2LTEwICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBEaXNhYmxlIFVJV2luZG93 IGZvciBmdWxsc2NyZWVuIHZpZGVvIGZvciBzZWxlY3RlZCBjbGllbnRzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1ODUyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIERpc2FibGUgVUlXaW5kb3cgZm9yIGZ1 bGxzY3JlZW4gdmlkZW8gZG9lc24ndCB3b3JrIGV2ZXJ5d2hlcmUgKHJkYXI6Ly9wcm9ibGVtLzIx MzE1OTkzKSwgc28ganVzdCBkaXNhYmxlIGl0IHdoZW4gY3JlYXRpbmcgYSBVSVdpbmRvdyB3b24n dCB3b3JrLgorICAgICAgICBGaXggc29tZSBpbnRlcmZhY2UgaGlkaW5nIGFuZCBsYXlvdXQgcHJv YmxlbXMgdGhhdCBzaG93ZWQgdXAgaW4gdGhlIG5vbiBVSVdpbmRvdyBjb2RlIHBhdGguCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MubW06IFJlbW92ZSBpQUQgYnVu ZGxlIGlkZW50aWZpZXIuCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OnNldHVwRnVsbHNjcmVlbik6IE9wdCBvdXQgb2YgVUlXaW5kb3cgd2hlbiBob3N0ZWQg aW4gYW5vdGhlciBwcm9jZXNzLiBBbmQgZml4IHZpZXcgcGFyZW50aW5nIGZvciBub24td2luZG93 IGNhc2UuCisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1 bGxzY3JlZW4pOiBGaXggZm9yIEFWS2l0IGV4aXQgZnVsbHNjcmVlbiBjb21wbGFpbmluZyBhYm91 dCAtbmVlZHNMYXlvdXQuCisKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpyZXF1ZXN0SGlkZUFuZEV4aXRGdWxsc2NyZWVuKToKKyAgICAgICAgKFdlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0OjpwcmVwYXJlZFRvUmV0dXJuVG9JbmxpbmUpOgorICAgICAg ICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdGFydE9wdGltaXplZEZ1 bGxzY3JlZW4pOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRp ZFN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbik6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdDo6d2lsbFN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuKToKKyAgICAgICAgKFdl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdG9wT3B0aW1pemVkRnVsbHNjcmVl bik6CisgICAgICAgIFRoZXNlIGhpZGUgYW5kIHNob3cgdGhlIHZpZXcgY29udHJvbGxlciB3aGVy ZSB3ZSBoaWRlIGFuZCBzaG93IHRoZSB3aW5kb3cuCisKIDIwMTUtMDYtMDQgIE15bGVzIEMuIE1h eGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIENsZWFuIHVw IG1fZm9udCBpbnNpZGUgRm9udFBsYXRmb3JtRGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzSU9TLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MuaAppbmRleCAzNDZjNzU2YzM0 NzBkMjAxZTNjNWMxNjIxNGNhNGRmODJkNWU1YjY1Li43N2E4ZGE5MzBjZTUzN2I5NzgzYmQzYTA1 ZGE5ODIyYWFjYzhmMDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50 aW1lQXBwbGljYXRpb25DaGVja3NJT1MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9S dW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MuaApAQCAtMjksNyArMjksNiBAQAogLy8gRklYTUU6 IFdlIHNob3VsZCBjb25zaWRlciBtZXJnaW5nIHRoaXMgZmlsZSB3aXRoIFJ1bnRpbWVBcHBsaWNh dGlvbkNoZWNrcy5oLgogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1ib29sIGFwcGxpY2F0aW9uSXNB ZFNoZWV0KCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGFwcGxpY2F0aW9uSXNNb2JpbGVNYWlsKCk7 CiBXRUJDT1JFX0VYUE9SVCBib29sIGFwcGxpY2F0aW9uSXNNb2JpbGVTYWZhcmkoKTsKIGJvb2wg YXBwbGljYXRpb25Jc0R1bXBSZW5kZXJUcmVlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MubW0KaW5kZXggY2FhZWU4Nzg3 NjcyMGViMWQ5YzBlNWI5NmM0MDYxYjlhNTFjODJhYy4uNDYyOWY0NDUwNWMwYjdhNmU1MGFkZjQz NjkwZGU0MTQ5YmFjMThhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVu dGltZUFwcGxpY2F0aW9uQ2hlY2tzSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrc0lPUy5tbQpAQCAtMzEsMTIgKzMxLDYgQEAKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCi1ib29sIGFwcGxpY2F0aW9uSXNBZFNoZWV0KCkKLXsKLSAgICBz dGF0aWMgY29uc3QgYm9vbCBpc0FkU2hlZXQgPSBbW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5k bGVJZGVudGlmaWVyXSBpc0VxdWFsVG9TdHJpbmc6QCJjb20uYXBwbGUuQWRTaGVldFBob25lIl07 Ci0gICAgcmV0dXJuIGlzQWRTaGVldDsKLX0KLQogYm9vbCBhcHBsaWNhdGlvbklzTW9iaWxlTWFp bCgpCiB7CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgaXNNb2JpbGVNYWlsID0gW1tbTlNCdW5kbGUg bWFpbkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl0gaXNFcXVhbFRvU3RyaW5nOkAiY29tLmFwcGxl Lm1vYmlsZW1haWwiXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQppbmRleCBjNGE0OTdm NTZiZTgzOTlkNDcxNjBjNDQwMDUzYzAzN2Y3OGQxNDhkLi5mMGU3ZTZkZjAwZmUwMWZkOTI1Yjgz MTQyMmQzMmNhODM0OWRiYTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC04 NzYsNiArODc2LDEwIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNl dEV4dGVybmFsUGxheWJhY2soYm9vbCBlbmFibGVkLCBFeHRlcm5hCiAgICAgW21fdmlkZW9MYXll ckNvbnRhaW5lci5nZXQoKSBzZXRIaWRkZW46ZW5hYmxlZF07CiB9CiAKK0BpbnRlcmZhY2UgVUlX aW5kb3cgKCkKKy0oQk9PTClfaXNIb3N0ZWRJbkFub3RoZXJQcm9jZXNzOworQGVuZAorCiB2b2lk IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXR1cEZ1bGxzY3JlZW4oUGxhdGZv cm1MYXllciYgdmlkZW9MYXllciwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgaW5pdGlhbFJlY3Qs IFVJVmlldyogcGFyZW50VmlldywgSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3Jl ZW5Nb2RlIG1vZGUsIGJvb2wgYWxsb3dPcHRpbWl6ZWRGdWxsc2NyZWVuKQogewogICAgIEFTU0VS VChtb2RlICE9IEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZU5vbmUp OwpAQCAtODkwLDcgKzg5NCw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZL aXQ6OnNldHVwRnVsbHNjcmVlbihQbGF0Zm9ybUxheWVyJiB2aWRlb0xheWVyCiAgICAgbV9wYXJl bnRWaWV3ID0gcGFyZW50VmlldzsKICAgICBtX3BhcmVudFdpbmRvdyA9IHBhcmVudFZpZXcud2lu ZG93OwogCi0gICAgaWYgKCFhcHBsaWNhdGlvbklzQWRTaGVldCgpKSB7CisgICAgaWYgKCFbW3Bh cmVudFZpZXcgd2luZG93XSBfaXNIb3N0ZWRJbkFub3RoZXJQcm9jZXNzXSkgewogICAgICAgICBt X3dpbmRvdyA9IGFkb3B0TlMoW2FsbG9jVUlXaW5kb3dJbnN0YW5jZSgpIGluaXRXaXRoRnJhbWU6 W1tnZXRVSVNjcmVlbkNsYXNzKCkgbWFpblNjcmVlbl0gYm91bmRzXV0pOwogICAgICAgICBbbV93 aW5kb3cgc2V0QmFja2dyb3VuZENvbG9yOltnZXRVSUNvbG9yQ2xhc3MoKSBjbGVhckNvbG9yXV07 CiAgICAgICAgIG1fdmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFthbGxvY1VJVmlld0NvbnRyb2xs ZXJJbnN0YW5jZSgpIGluaXRdKTsKQEAgLTkyNiwxMSArOTMwLDEwIEBAIHZvaWQgV2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldHVwRnVsbHNjcmVlbihQbGF0Zm9ybUxheWVyJiB2 aWRlb0xheWVyCiAgICAgaWYgKG1fdmlld0NvbnRyb2xsZXIpIHsKICAgICAgICAgW21fdmlld0Nv bnRyb2xsZXIgYWRkQ2hpbGRWaWV3Q29udHJvbGxlcjptX3BsYXllclZpZXdDb250cm9sbGVyLmdl dCgpXTsKICAgICAgICAgW1ttX3ZpZXdDb250cm9sbGVyIHZpZXddIGFkZFN1YnZpZXc6W21fcGxh eWVyVmlld0NvbnRyb2xsZXIgdmlld11dOwotICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxl ciB2aWV3XS5mcmFtZSA9IFtwYXJlbnRWaWV3IGNvbnZlcnRSZWN0OmluaXRpYWxSZWN0IHRvVmll dzpuaWxdOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIFtwYXJlbnRWaWV3IGFkZFN1YnZpZXc6W21f cGxheWVyVmlld0NvbnRyb2xsZXIgdmlld11dOwotICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJv bGxlciB2aWV3XS5mcmFtZSA9IGluaXRpYWxSZWN0OwotICAgIH0KKyAgICB9IGVsc2UKKyAgICAg ICAgW3BhcmVudFZpZXcud2luZG93IGFkZFN1YnZpZXc6W21fcGxheWVyVmlld0NvbnRyb2xsZXIg dmlld11dOworCisgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10uZnJhbWUgPSBbcGFy ZW50VmlldyBjb252ZXJ0UmVjdDppbml0aWFsUmVjdCB0b1ZpZXc6bmlsXTsKIAogICAgIFtbbV9w bGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXRCYWNrZ3JvdW5kQ29sb3I6W2dldFVJQ29sb3JD bGFzcygpIGNsZWFyQ29sb3JdXTsKICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10g c2V0TmVlZHNMYXlvdXRdOwpAQCAtOTk0LDI3ICs5OTcsMjYgQEAgdm9pZCBXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1bGxzY3JlZW4oY29uc3QgV2ViQ29yZTo6SW50UmVj dCYgZmkKICAgICAKICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVlbiglcCkiLCB0aGlzKTsKICAgICBbbV9wbGF5ZXJWaWV3 Q29udHJvbGxlciBzZXRTaG93c1BsYXliYWNrQ29udHJvbHM6Tk9dOwotICAgIGlmIChtX3ZpZXdD b250cm9sbGVyKQotICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XS5mcmFtZSA9 IFttX3BhcmVudFZpZXcgY29udmVydFJlY3Q6ZmluYWxSZWN0IHRvVmlldzpuaWxdOwotICAgIGVs c2UKLSAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10uZnJhbWUgPSBmaW5hbFJl Y3Q7CisgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10uZnJhbWUgPSBbbV9wYXJlbnRW aWV3IGNvbnZlcnRSZWN0OmZpbmFsUmVjdCB0b1ZpZXc6bmlsXTsKIAogICAgIGlmIChbbV92aWRl b0xheWVyQ29udGFpbmVyIHZpZGVvTGF5ZXJHcmF2aXR5XSAhPSBBVlZpZGVvTGF5ZXJHcmF2aXR5 UmVzaXplQXNwZWN0KQogICAgICAgICBbbV92aWRlb0xheWVyQ29udGFpbmVyIHNldFZpZGVvTGF5 ZXJHcmF2aXR5OkFWVmlkZW9MYXllckdyYXZpdHlSZXNpemVBc3BlY3RdOwogICAgIFtbbV9wbGF5 ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRlZF07CiAKLQogICAgIGlmIChpc01v ZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlT3B0aW1pemVkKSkg ewogICAgICAgICBbbV93aW5kb3cgc2V0SGlkZGVuOk5PXTsKKyAgICAgICAgW1ttX3BsYXllclZp ZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpOT107CiAgICAgICAgIFttX3BsYXllclZpZXdD b250cm9sbGVyIHN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuXTsKICAgICB9IGVsc2UgaWYgKGlzTW9k ZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVPcHRpbWl6ZWQgfCBI VE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkpIHsKICAg ICAgICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0PiBzdHJvbmdUaGlz KHRoaXMpOwogICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFu aW1hdGVkOk5PIGNvbXBsZXRpb25IYW5kbGVyOltzdHJvbmdUaGlzLCB0aGlzXSAoQk9PTCwgTlNF cnJvciopIHsKICAgICAgICAgICAgIFttX3dpbmRvdyBzZXRIaWRkZW46Tk9dOworICAgICAgICAg ICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpOT107CiAgICAgICAg ICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBzdG9wT3B0aW1pemVkRnVsbHNjcmVlbl07CiAg ICAgICAgIH1dOwogICAgIH0gZWxzZSBpZiAoaXNNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6 VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKSkgewogICAgICAgICBSZWZQdHI8V2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ+IHN0cm9uZ1RoaXModGhpcyk7CisgICAgICAgIFtbbV9w bGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRlZF07CiAgICAgICAgIFttX3Bs YXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb25I YW5kbGVyOltzdHJvbmdUaGlzLCB0aGlzXSAoQk9PTCwgTlNFcnJvciopIHsKICAgICAgICAgICAg IG1fZXhpdENvbXBsZXRlZCA9IHRydWU7CiAKQEAgLTExMDUsNiArMTEwNyw3IEBAIHZvaWQgV2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnJlcXVlc3RIaWRlQW5kRXhpdEZ1bGxzY3Jl ZW4oKQogICAgIExPRyhGdWxsc2NyZWVuLCAiV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZL aXQ6OnJlcXVlc3RIaWRlQW5kRXhpdEZ1bGxzY3JlZW4oJXApIiwgdGhpcyk7CiAKICAgICBbbV93 aW5kb3cgc2V0SGlkZGVuOllFU107CisgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXdd IHNldEhpZGRlbjpZRVNdOwogCiAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwgJiYgIW1f ZXhpdFJlcXVlc3RlZCkgewogICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5wYXVzZSgp OwpAQCAtMTExNywxMCArMTEyMCw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OnByZXBhcmVkVG9SZXR1cm5Ub0lubGluZShib29sIHZpc2libGUsIGNvCiAgICAgTE9H KEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6cHJlcGFyZWRU b1JldHVyblRvSW5saW5lKCVwKSAtIHZpc2libGUoJXMpIiwgdGhpcywgYm9vbFN0cmluZyh2aXNp YmxlKSk7CiAgICAgaWYgKG1fcHJlcGFyZVRvSW5saW5lQ2FsbGJhY2spIHsKICAgICAgICAgCi0g ICAgICAgIGlmIChtX3ZpZXdDb250cm9sbGVyKQotICAgICAgICAgICAgW21fcGxheWVyVmlld0Nv bnRyb2xsZXIgdmlld10uZnJhbWUgPSBbbV9wYXJlbnRWaWV3IGNvbnZlcnRSZWN0OmlubGluZVJl Y3QgdG9WaWV3Om5pbF07Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIFttX3BsYXllclZpZXdD b250cm9sbGVyIHZpZXddLmZyYW1lID0gaW5saW5lUmVjdDsKKyAgICAgICAgW21fcGxheWVyVmll d0NvbnRyb2xsZXIgdmlld10uZnJhbWUgPSBbbV9wYXJlbnRWaWV3IGNvbnZlcnRSZWN0OmlubGlu ZVJlY3QgdG9WaWV3Om5pbF07CiAKICAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKGJvb2wpPiBj YWxsYmFjayA9IFdURjo6bW92ZShtX3ByZXBhcmVUb0lubGluZUNhbGxiYWNrKTsKICAgICAgICAg Y2FsbGJhY2sodmlzaWJsZSk7CkBAIC0xMTUzLDYgKzExNTMsNyBAQCB2b2lkIFdlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCkKIAog ICAgICAgICBpZiAoIXZpc2libGUpIHsKICAgICAgICAgICAgIFttX3dpbmRvdyBzZXRIaWRkZW46 WUVTXTsKKyAgICAgICAgICAgIFtbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXRIaWRk ZW46WUVTXTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC0xMTYzLDYgKzEx NjQsNyBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3RhcnRP cHRpbWl6ZWRGdWxsc2NyZWVuKCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICBjbGVhck1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3Rh bmRhcmQpOwogICAgICAgICAgICAgW21fd2luZG93IHNldEhpZGRlbjpZRVNdOworICAgICAgICAg ICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpZRVNdOwogICAgICAg ICB9XTsKICAgICB9KTsKIH0KQEAgLTExNzIsNiArMTE3NCw3IEBAIHZvaWQgV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbigpCiAgICAg TE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3Rh cnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOwogICAgIFttX3BsYXllclZpZXdDb250 cm9sbGVyIHNldFNob3dzUGxheWJhY2tDb250cm9sczpZRVNdOwogICAgIFttX3dpbmRvdyBzZXRI aWRkZW46WUVTXTsKKyAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gc2V0SGlkZGVu OllFU107CiAKICAgICBpZiAobV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXIpCiAgICAgICAgIG1f ZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyLT5kaWRFbnRlckZ1bGxzY3JlZW4oKTsKQEAgLTExOTgs NiArMTIwMSw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxT dG9wT3B0aW1pemVkRnVsbHNjcmVlbigpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuKCVw KSIsIHRoaXMpOwogICAgIFttX3dpbmRvdyBzZXRIaWRkZW46Tk9dOworICAgIFtbbV9wbGF5ZXJW aWV3Q29udHJvbGxlciB2aWV3XSBzZXRIaWRkZW46Tk9dOwogCiAgICAgaWYgKG1fdmlkZW9GdWxs c2NyZWVuTW9kZWwpCiAgICAgICAgIG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwtPnJlcXVlc3RFeGl0 RnVsbHNjcmVlbigpOwpAQCAtMTIxNiw2ICsxMjIwLDcgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3RvcE9wdGltaXplZEZ1bGxzY3JlZW4oKQogCiAgICAgY2xl YXJNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZU9wdGltaXpl ZCk7CiAgICAgW21fd2luZG93IHNldEhpZGRlbjpZRVNdOworICAgIFtbbV9wbGF5ZXJWaWV3Q29u dHJvbGxlciB2aWV3XSBzZXRIaWRkZW46WUVTXTsKICAgICAKICAgICBpZiAobV9mdWxsc2NyZWVu Q2hhbmdlT2JzZXJ2ZXIpCiAgICAgICAgIG1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyLT5kaWRF eGl0RnVsbHNjcmVlbigpOwo= 255164 2015-06-18 19:27:21 -0700 2015-06-18 20:46:49 -0700 Patch for landing. bug-145852-20150618192644.patch text/plain 8703 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWJmY2I0ODY5NmQ3ZDE5 NGQ5NzI0NTFlNjQ2YzYwMjgzMDFlYjdlYi4uNmFlMTc4NGMwZWM2YzY0YmYyZjc3YWM3NjhmZDBl NDkzYzFkYjJmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA2LTE4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBEaXNhYmxlIFVJV2luZG93 IGZvciBmdWxsc2NyZWVuIHZpZGVvIGZvciBzZWxlY3RlZCBjbGllbnRzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1ODUyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIERpc2FibGUgVUlXaW5kb3cgZm9yIGZ1 bGxzY3JlZW4gdmlkZW8gZG9lc24ndCB3b3JrIGV2ZXJ5d2hlcmUgKHJkYXI6Ly9wcm9ibGVtLzIx MzE1OTkzKSwgc28ganVzdCBkaXNhYmxlIGl0IHdoZW4gY3JlYXRpbmcgYSBVSVdpbmRvdyB3b24n dCB3b3JrLgorICAgICAgICBGaXggc29tZSBpbnRlcmZhY2UgaGlkaW5nIGFuZCBsYXlvdXQgcHJv YmxlbXMgdGhhdCBzaG93ZWQgdXAgaW4gdGhlIG5vbiBVSVdpbmRvdyBjb2RlIHBhdGguCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MubW06IFJlbW92ZSBpQUQgYnVu ZGxlIGlkZW50aWZpZXIuCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OnNldHVwRnVsbHNjcmVlbik6IE9wdCBvdXQgb2YgVUlXaW5kb3cgd2hlbiBob3N0ZWQg aW4gYW5vdGhlciBwcm9jZXNzLiBBbmQgZml4IHZpZXcgcGFyZW50aW5nIGZvciBub24td2luZG93 IGNhc2UuCisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1 bGxzY3JlZW4pOiBGaXggZm9yIEFWS2l0IGV4aXQgZnVsbHNjcmVlbiBjb21wbGFpbmluZyBhYm91 dCAtbmVlZHNMYXlvdXQuCisKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpyZXF1ZXN0SGlkZUFuZEV4aXRGdWxsc2NyZWVuKToKKyAgICAgICAgKFdlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0OjpwcmVwYXJlZFRvUmV0dXJuVG9JbmxpbmUpOgorICAgICAg ICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdGFydE9wdGltaXplZEZ1 bGxzY3JlZW4pOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRp ZFN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbik6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdDo6d2lsbFN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuKToKKyAgICAgICAgKFdl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdG9wT3B0aW1pemVkRnVsbHNjcmVl bik6CisgICAgICAgIFRoZXNlIGhpZGUgYW5kIHNob3cgdGhlIHZpZXcgY29udHJvbGxlciB3aGVy ZSB3ZSBoaWRlIGFuZCBzaG93IHRoZSB3aW5kb3cuCisKIDIwMTUtMDYtMTggIERlYW4gSmFja3Nv biAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFByb3ZpZGUgYSB3YXkgZm9yIHdlYiBkZXZl bG9wZXJzIHRvIGRyYXcgYSBUaGVtZS1zcGVjaWZpYyBXaXJlbGVzcyBQbGF5YmFjayBpY29uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVj a3NJT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNr c0lPUy5oCmluZGV4IDM0NmM3NTZjMzQ3MGQyMDFlM2M1YzE2MjE0Y2E0ZGY4MmQ1ZTViNjUuLjc3 YThkYTkzMGNlNTM3Yjk3ODNiZDNhMDVkYTk4MjJhYWNjOGYwNzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrc0lPUy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrc0lPUy5oCkBAIC0y OSw3ICsyOSw2IEBACiAvLyBGSVhNRTogV2Ugc2hvdWxkIGNvbnNpZGVyIG1lcmdpbmcgdGhpcyBm aWxlIHdpdGggUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmguCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKLWJvb2wgYXBwbGljYXRpb25Jc0FkU2hlZXQoKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgYXBw bGljYXRpb25Jc01vYmlsZU1haWwoKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgYXBwbGljYXRpb25J c01vYmlsZVNhZmFyaSgpOwogYm9vbCBhcHBsaWNhdGlvbklzRHVtcFJlbmRlclRyZWUoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNr c0lPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNr c0lPUy5tbQppbmRleCBjYWFlZTg3ODc2NzIwZWIxZDljMGU1Yjk2YzQwNjFiOWE1MWM4MmFjLi40 NjI5ZjQ0NTA1YzBiN2E2ZTUwYWRmNDM2OTBkZTQxNDliYWMxOGFjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NJT1MubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzSU9TLm1tCkBA IC0zMSwxMiArMzEsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWJvb2wgYXBwbGljYXRp b25Jc0FkU2hlZXQoKQotewotICAgIHN0YXRpYyBjb25zdCBib29sIGlzQWRTaGVldCA9IFtbW05T QnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50aWZpZXJdIGlzRXF1YWxUb1N0cmluZzpAImNv bS5hcHBsZS5BZFNoZWV0UGhvbmUiXTsKLSAgICByZXR1cm4gaXNBZFNoZWV0OwotfQotCiBib29s IGFwcGxpY2F0aW9uSXNNb2JpbGVNYWlsKCkKIHsKICAgICBzdGF0aWMgY29uc3QgYm9vbCBpc01v YmlsZU1haWwgPSBbW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXSBpc0Vx dWFsVG9TdHJpbmc6QCJjb20uYXBwbGUubW9iaWxlbWFpbCJdOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUFWS2l0Lm1tCmluZGV4IDllN2I1ODRjYjg0NTgwZTUxOGY0NmVkNTdlZjQ2MjczZTA4ZGQ2Yjcu LjcxODQyYjQ2MTIyODJjZjMyZDM5ZGIxNTk1MzAxYTZhM2Y3MDFhYjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQubW0KQEAgLTg3Niw2ICs4NzYsMTAgQEAgdm9pZCBXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0RXh0ZXJuYWxQbGF5YmFjayhib29sIGVuYWJsZWQsIEV4 dGVybmEKICAgICBbbV92aWRlb0xheWVyQ29udGFpbmVyLmdldCgpIHNldEhpZGRlbjplbmFibGVk XTsKIH0KIAorQGludGVyZmFjZSBVSVdpbmRvdyAoKQorLShCT09MKV9pc0hvc3RlZEluQW5vdGhl clByb2Nlc3M7CitAZW5kCisKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6 OnNldHVwRnVsbHNjcmVlbihQbGF0Zm9ybUxheWVyJiB2aWRlb0xheWVyLCBjb25zdCBXZWJDb3Jl OjpJbnRSZWN0JiBpbml0aWFsUmVjdCwgVUlWaWV3KiBwYXJlbnRWaWV3LCBIVE1MTWVkaWFFbGVt ZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUgbW9kZSwgYm9vbCBhbGxvd3NQaWN0dXJlSW5Q aWN0dXJlUGxheWJhY2spCiB7CiAgICAgQVNTRVJUKG1vZGUgIT0gSFRNTE1lZGlhRWxlbWVudEVu dW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSk7CkBAIC04OTAsNyArODk0LDcgQEAgdm9pZCBX ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0dXBGdWxsc2NyZWVuKFBsYXRmb3Jt TGF5ZXImIHZpZGVvTGF5ZXIKICAgICBtX3BhcmVudFZpZXcgPSBwYXJlbnRWaWV3OwogICAgIG1f cGFyZW50V2luZG93ID0gcGFyZW50Vmlldy53aW5kb3c7CiAKLSAgICBpZiAoIWFwcGxpY2F0aW9u SXNBZFNoZWV0KCkpIHsKKyAgICBpZiAoIVtbcGFyZW50VmlldyB3aW5kb3ddIF9pc0hvc3RlZElu QW5vdGhlclByb2Nlc3NdKSB7CiAgICAgICAgIG1fd2luZG93ID0gYWRvcHROUyhbYWxsb2NVSVdp bmRvd0luc3RhbmNlKCkgaW5pdFdpdGhGcmFtZTpbW2dldFVJU2NyZWVuQ2xhc3MoKSBtYWluU2Ny ZWVuXSBib3VuZHNdXSk7CiAgICAgICAgIFttX3dpbmRvdyBzZXRCYWNrZ3JvdW5kQ29sb3I6W2dl dFVJQ29sb3JDbGFzcygpIGNsZWFyQ29sb3JdXTsKICAgICAgICAgbV92aWV3Q29udHJvbGxlciA9 IGFkb3B0TlMoW2FsbG9jVUlWaWV3Q29udHJvbGxlckluc3RhbmNlKCkgaW5pdF0pOwpAQCAtOTI2 LDExICs5MzAsMTAgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0 dXBGdWxsc2NyZWVuKFBsYXRmb3JtTGF5ZXImIHZpZGVvTGF5ZXIKICAgICBpZiAobV92aWV3Q29u dHJvbGxlcikgewogICAgICAgICBbbV92aWV3Q29udHJvbGxlciBhZGRDaGlsZFZpZXdDb250cm9s bGVyOm1fcGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCldOwogICAgICAgICBbW21fdmlld0NvbnRy b2xsZXIgdmlld10gYWRkU3VidmlldzpbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XV07Ci0g ICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddLmZyYW1lID0gW3BhcmVudFZpZXcg Y29udmVydFJlY3Q6aW5pdGlhbFJlY3QgdG9WaWV3Om5pbF07Ci0gICAgfSBlbHNlIHsKLSAgICAg ICAgW3BhcmVudFZpZXcgYWRkU3VidmlldzpbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XV07 Ci0gICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddLmZyYW1lID0gaW5pdGlhbFJl Y3Q7Ci0gICAgfQorICAgIH0gZWxzZQorICAgICAgICBbcGFyZW50Vmlldy53aW5kb3cgYWRkU3Vi dmlldzpbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XV07CisKKyAgICBbbV9wbGF5ZXJWaWV3 Q29udHJvbGxlciB2aWV3XS5mcmFtZSA9IFtwYXJlbnRWaWV3IGNvbnZlcnRSZWN0OmluaXRpYWxS ZWN0IHRvVmlldzpuaWxdOwogCiAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNl dEJhY2tncm91bmRDb2xvcjpbZ2V0VUlDb2xvckNsYXNzKCkgY2xlYXJDb2xvcl1dOwogICAgIFtb bV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXROZWVkc0xheW91dF07CkBAIC0xMDAzLDcg KzEwMDYsNiBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVs bHNjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBmaQogICAgICAgICBbbV92aWRlb0xheWVy Q29udGFpbmVyIHNldFZpZGVvTGF5ZXJHcmF2aXR5OkFWVmlkZW9MYXllckdyYXZpdHlSZXNpemVB c3BlY3RdOwogICAgIFtbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRl ZF07CiAKLQogICAgIGlmIChpc01vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxz Y3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSkpIHsKICAgICAgICAgW21fd2luZG93IHNldEhpZGRl bjpOT107CiAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0b3BQaWN0dXJlSW5QaWN0 dXJlXTsKQEAgLTExMDUsNiArMTEwNyw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlQVZLaXQ6OnJlcXVlc3RIaWRlQW5kRXhpdEZ1bGxzY3JlZW4oKQogICAgIExPRyhGdWxsc2Ny ZWVuLCAiV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnJlcXVlc3RIaWRlQW5kRXhp dEZ1bGxzY3JlZW4oJXApIiwgdGhpcyk7CiAKICAgICBbbV93aW5kb3cgc2V0SGlkZGVuOllFU107 CisgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpZRVNdOwogCiAg ICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwgJiYgIW1fZXhpdFJlcXVlc3RlZCkgewogICAg ICAgICBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5wYXVzZSgpOwpAQCAtMTExNywxMCArMTEyMCw3 IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnByZXBhcmVkVG9SZXR1 cm5Ub0lubGluZShib29sIHZpc2libGUsIGNvCiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6cHJlcGFyZWRUb1JldHVyblRvSW5saW5lKCVwKSAt IHZpc2libGUoJXMpIiwgdGhpcywgYm9vbFN0cmluZyh2aXNpYmxlKSk7CiAgICAgaWYgKG1fcHJl cGFyZVRvSW5saW5lQ2FsbGJhY2spIHsKICAgICAgICAgCi0gICAgICAgIGlmIChtX3ZpZXdDb250 cm9sbGVyKQotICAgICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10uZnJhbWUg PSBbbV9wYXJlbnRWaWV3IGNvbnZlcnRSZWN0OmlubGluZVJlY3QgdG9WaWV3Om5pbF07Ci0gICAg ICAgIGVsc2UKLSAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddLmZyYW1l ID0gaW5saW5lUmVjdDsKKyAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10uZnJh bWUgPSBbbV9wYXJlbnRWaWV3IGNvbnZlcnRSZWN0OmlubGluZVJlY3QgdG9WaWV3Om5pbF07CiAK ICAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKGJvb2wpPiBjYWxsYmFjayA9IFdURjo6bW92ZSht X3ByZXBhcmVUb0lubGluZUNhbGxiYWNrKTsKICAgICAgICAgY2FsbGJhY2sodmlzaWJsZSk7CkBA IC0xMTUzLDYgKzExNTMsNyBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 Ojp3aWxsU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCkKIAogICAgICAgICBpZiAoIXZpc2libGUpIHsK ICAgICAgICAgICAgIFttX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKKyAgICAgICAgICAgIFtbbV9w bGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXRIaWRkZW46WUVTXTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogCkBAIC0xMTYzLDYgKzExNjQsNyBAQCB2b2lkIFdlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCkKICAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBjbGVhck1vZGUoSFRNTE1lZGlhRWxlbWVu dEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3RhbmRhcmQpOwogICAgICAgICAgICAgW21fd2lu ZG93IHNldEhpZGRlbjpZRVNdOworICAgICAgICAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVy IHZpZXddIHNldEhpZGRlbjpZRVNdOwogICAgICAgICB9XTsKICAgICB9KTsKIH0KQEAgLTExNzIs NiArMTE3NCw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0 YXJ0UGljdHVyZUluUGljdHVyZSgpCiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCVwKSIsIHRoaXMp OwogICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHNldFNob3dzUGxheWJhY2tDb250cm9sczpZ RVNdOwogICAgIFttX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKKyAgICBbW21fcGxheWVyVmlld0Nv bnRyb2xsZXIgdmlld10gc2V0SGlkZGVuOllFU107CiAKICAgICBpZiAobV9mdWxsc2NyZWVuQ2hh bmdlT2JzZXJ2ZXIpCiAgICAgICAgIG1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyLT5kaWRFbnRl ckZ1bGxzY3JlZW4oKTsKQEAgLTExOTgsNiArMTIwMSw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdG9wUGljdHVyZUluUGljdHVyZSgpCiB7CiAgICAgTE9H KEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0b3BQ aWN0dXJlSW5QaWN0dXJlKCVwKSIsIHRoaXMpOwogICAgIFttX3dpbmRvdyBzZXRIaWRkZW46Tk9d OworICAgIFtbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXRIaWRkZW46Tk9dOwogCiAg ICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwpCiAgICAgICAgIG1fdmlkZW9GdWxsc2NyZWVu TW9kZWwtPnJlcXVlc3RFeGl0RnVsbHNjcmVlbigpOwpAQCAtMTIxNiw2ICsxMjIwLDcgQEAgdm9p ZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3RvcFBpY3R1cmVJblBpY3R1 cmUoKQogCiAgICAgY2xlYXJNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2Ny ZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpOwogICAgIFttX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsK KyAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gc2V0SGlkZGVuOllFU107CiAgICAg CiAgICAgaWYgKG1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyKQogICAgICAgICBtX2Z1bGxzY3Jl ZW5DaGFuZ2VPYnNlcnZlci0+ZGlkRXhpdEZ1bGxzY3JlZW4oKTsK