145340 2015-05-22 22:20:43 -0700 Handle case where -startOptimizedFullscreen fails. 2015-05-27 10:12:35 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue oldest_to_newest 1097059 0 jeremyj-wk 2015-05-22 22:20:43 -0700 Handle case where -startOptimizedFullscreen fails. 1097060 1 jeremyj-wk 2015-05-22 22:21:18 -0700 rdar://problem/19416954 1097061 2 253638 jeremyj-wk 2015-05-22 22:28:39 -0700 Created attachment 253638 Patch 1097149 3 253638 eric.carlson 2015-05-24 08:40:39 -0700 Comment on attachment 253638 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253638&action=review > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:1291 > + RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this); > + WebThreadRun([strongThis, this] { > + if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard)) > + return; > + > + m_exitCompleted = true; This will leave m_exitCompleted set to true if hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard). Will this cause problems later? 1097150 4 jeremyj-wk 2015-05-24 10:00:09 -0700 (In reply to comment #3) > Comment on attachment 253638 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=253638&action=review > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:1291 > > + RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this); > > + WebThreadRun([strongThis, this] { > > + if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard)) > > + return; > > + > > + m_exitCompleted = true; > > This will leave m_exitCompleted set to true if > hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard). Will this cause > problems later? I think you mean leave it false. And that is exactly what we want. If we still have standard mode, then we have not completely exited fullscreen. Also, the build error is SPI that I'll add to AVKitSPI.h 1097152 5 253658 jeremyj-wk 2015-05-24 10:18:58 -0700 Created attachment 253658 Patch 1097652 6 253658 commit-queue 2015-05-27 10:12:32 -0700 Comment on attachment 253658 Patch Clearing flags on attachment: 253658 Committed r184907: <http://trac.webkit.org/changeset/184907> 1097653 7 commit-queue 2015-05-27 10:12:35 -0700 All reviewed patches have been landed. Closing bug. 253638 2015-05-22 22:28:39 -0700 2015-05-24 10:18:55 -0700 Patch bug-145340-20150522222833.patch text/plain 9060 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0Nzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVkOTk0MzU5MGYwNDhm ZTg2ODFjMjM0ODU4MmJkYzBhZTBhYjAxMS4uZGUwODI4YWQ5YWU5MDBjZmZiYjM5ZTU3ZDQwMGJk ZjI2OWMzMTQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA1LTIyICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBIYW5kbGUgY2FzZSB3aGVy ZSAtc3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuIGZhaWxzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MzQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG5ldyBBVlBsYXllclZpZXdDb250cm9sbGVy IGRlbGVnYXRlIG1ldGhvZHMgYW5kIHJlbW92ZSBvbGQgb25lcy4KKyAgICAgICAgLXN0YXJ0T3B0 aW1pemVkRnVsbHNjcmVlbiBjYW4gZWl0aGVyIGZhaWwgc2lsZW50bHkgYmVjYXVzZSBpdCBpcyBu b3QgYWxsb3dlZCBvciBpdCB3aWxsIGNhbGwgYSBkZWxlZ2F0ZS4KKyAgICAgICAgV2UgcHJldmVu dCBzaWxlbnQgZmFpbHVyZSBieSB0ZXN0aW5nIHByZWNvbmRpdGlvbnMgaW4gZW50ZXJGdWxsc2Ny ZWVuT3B0aW1pemVkLCBhbmQgYWRkIHRoZSAKKyAgICAgICAgZGVsZWdhdGUgLXBsYXllclZpZXdD b250cm9sbGVyRmFpbGVkVG9TdGFydE9wdGltaXplZEZ1bGxzY3JlZW4gdG8gaGFuZGxlIGV4cGxp Y2l0bHkgZmFpbHVyZS4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5oOiBhZGRlZC9yZW1vdmVkIG1ldGhvZCBkZWNsYXJhdGlvbnMuCisg ICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1t OiAKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJDb250cm9sbGVyIHBsYXllclZpZXdDb250cm9sbGVy RmFpbGVkVG9TdGFydE9wdGltaXplZEZ1bGxzY3JlZW46d2l0aEVycm9yOl0pOiBBZGRlZC4KKyAg ICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW5P cHRpbWl6ZWQpOiBIYW5kbGUgc2lsZW50IGZhaWx1cmUuCisgICAgICAgIChXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKTogSGlkZSB3 aW5kb3cgb24gbWFpbiB0aHJlYWQuCisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdDo6ZmFpbGVkVG9TdGFydE9wdGltaXplZEZ1bGxzY3JlZW4pOiBBZGRlZAorICAgICAg ICAoLVtXZWJBVlBsYXllckNvbnRyb2xsZXIgcGxheWVyVmlld0NvbnRyb2xsZXJXaWxsQ2FuY2Vs T3B0aW1pemVkRnVsbHNjcmVlbjpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJD b250cm9sbGVyIHBsYXllclZpZXdDb250cm9sbGVyRGlkQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVl bjpdKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 Ojp3aWxsQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVlbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVl bik6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmg6IFJl bW92ZSBkZWFkIFNQSS4KKwogMjAxNS0wNS0yMiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4Zmll bGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gVXNlIENURm9udERyYXdHbHlwaHMoKSBp bnN0ZWFkIG9mIENHQ29udGV4dFNob3dHbHlwaHNXaXRoQWR2YW5jZXMoKS9DR0NvbnRleHRTaG93 R2x5cGhzQXRQb3NpdGlvbnMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQuaAppbmRleCA3YWQ2 NWRkMTg1Yzg5ZTQ5OGU1ZDM4MDVmM2NhZjU5ZTkxMzIyMGI5Li5iZDBjNzJkZDRlMTI1ZDE3ZTE1 OWY0Yjc2Zjk5ZWI5MzdlNDlkOGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQuaApAQCAt MTA3LDEwICsxMDcsOSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHdpbGxTdGFydE9wdGltaXplZEZ1 bGxzY3JlZW4oKTsKICAgICB2b2lkIGRpZFN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbigpOworICAg IHZvaWQgZmFpbGVkVG9TdGFydE9wdGltaXplZEZ1bGxzY3JlZW4oKTsKICAgICB2b2lkIHdpbGxT dG9wT3B0aW1pemVkRnVsbHNjcmVlbigpOwogICAgIHZvaWQgZGlkU3RvcE9wdGltaXplZEZ1bGxz Y3JlZW4oKTsKLSAgICB2b2lkIHdpbGxDYW5jZWxPcHRpbWl6ZWRGdWxsc2NyZWVuKCk7Ci0gICAg dm9pZCBkaWRDYW5jZWxPcHRpbWl6ZWRGdWxsc2NyZWVuKCk7CiAgICAgdm9pZCBwcmVwYXJlRm9y T3B0aW1pemVkRnVsbHNjcmVlblN0b3BXaXRoQ29tcGxldGlvbkhhbmRsZXIodm9pZCAoXikoQk9P TCkpOwogCiAgICAgdm9pZCBzZXRNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxs c2NyZWVuTW9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggMzVlNzg2NGQ1 ZGE0NGNlNTk0NWJkN2EyNTEwNGNkNWQ0NGVhNWEyOS4uOGRhNmVjYWI3ZDIxZmZkOTg5MGRiNGRh ZmNmNDFlOWU1Y2U5YjEwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAtMjA0 LDYgKzIwNCwxMyBAQCBzdGF0aWMgY29uc3QgY2hhciogYm9vbFN0cmluZyhib29sIHZhbCkKICAg ICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPmRpZFN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbigp OwogfQogCistICh2b2lkKXBsYXllclZpZXdDb250cm9sbGVyRmFpbGVkVG9TdGFydE9wdGltaXpl ZEZ1bGxzY3JlZW46KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxl ciB3aXRoRXJyb3I6KE5TRXJyb3IgKillcnJvcgoreworICAgIFVOVVNFRF9QQVJBTShwbGF5ZXJW aWV3Q29udHJvbGxlcik7CisgICAgVU5VU0VEX1BBUkFNKGVycm9yKTsKKyAgICBzZWxmLmZ1bGxz Y3JlZW5JbnRlcmZhY2UtPmZhaWxlZFRvU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCk7Cit9CisK IC0gKHZvaWQpcGxheWVyVmlld0NvbnRyb2xsZXJXaWxsU3RvcE9wdGltaXplZEZ1bGxzY3JlZW46 KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlcgogewogICAgIFVO VVNFRF9QQVJBTShwbGF5ZXJWaWV3Q29udHJvbGxlcik7CkBAIC0yMTYsMTggKzIyMyw2IEBAIHN0 YXRpYyBjb25zdCBjaGFyKiBib29sU3RyaW5nKGJvb2wgdmFsKQogICAgIHNlbGYuZnVsbHNjcmVl bkludGVyZmFjZS0+ZGlkU3RvcE9wdGltaXplZEZ1bGxzY3JlZW4oKTsKIH0KIAotLSAodm9pZClw bGF5ZXJWaWV3Q29udHJvbGxlcldpbGxDYW5jZWxPcHRpbWl6ZWRGdWxsc2NyZWVuOihBVlBsYXll clZpZXdDb250cm9sbGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIKLXsKLSAgICBVTlVTRURfUEFS QU0ocGxheWVyVmlld0NvbnRyb2xsZXIpOwotICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+ d2lsbENhbmNlbE9wdGltaXplZEZ1bGxzY3JlZW4oKTsKLX0KLQotLSAodm9pZClwbGF5ZXJWaWV3 Q29udHJvbGxlckRpZENhbmNlbE9wdGltaXplZEZ1bGxzY3JlZW46KEFWUGxheWVyVmlld0NvbnRy b2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlcgotewotICAgIFVOVVNFRF9QQVJBTShwbGF5ZXJW aWV3Q29udHJvbGxlcik7Ci0gICAgc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlLT5kaWRDYW5jZWxP cHRpbWl6ZWRGdWxsc2NyZWVuKCk7Ci19Ci0KIC0gKEJPT0wpcGxheWVyVmlld0NvbnRyb2xsZXI6 KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlciBzaG91bGRFeGl0 RnVsbFNjcmVlbldpdGhSZWFzb246KEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVl blJlYXNvbilyZWFzb24KIHsKICAgICBVTlVTRURfUEFSQU0ocGxheWVyVmlld0NvbnRyb2xsZXIp OwpAQCAtMTAzMyw3ICsxMDI4LDExIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OmVudGVyRnVsbHNjcmVlbk9wdGltaXplZCgpCiAgICAgUmVmUHRyPFdlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0PiBzdHJvbmdUaGlzKHRoaXMpOwogCiAgICAgTE9HKEZ1bGxz Y3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZW50ZXJGdWxsc2NyZWVu T3B0aW1pemVkKCVwKSIsIHRoaXMpOwotICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0 T3B0aW1pemVkRnVsbHNjcmVlbl07CisgICAgCisgICAgaWYgKFttX3BsYXllclZpZXdDb250cm9s bGVyIGlzT3B0aW1pemVkRnVsbHNjcmVlblBvc3NpYmxlXSkKKyAgICAgICAgW21fcGxheWVyVmll d0NvbnRyb2xsZXIgc3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuXTsKKyAgICBlbHNlCisgICAgICAg IGZhaWxlZFRvU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCk7CiB9CiAKIHZvaWQgV2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlblN0YW5kYXJkKCkKQEAgLTEy NzAsMTUgKzEyNjksMzUgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 ZGlkU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCkKIHsKICAgICBMT0coRnVsbHNjcmVlbiwgIldl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdGFydE9wdGltaXplZEZ1bGxzY3Jl ZW4oJXApIiwgdGhpcyk7CiAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc2V0U2hvd3NQbGF5 YmFja0NvbnRyb2xzOllFU107CisgICAgW21fd2luZG93IHNldEhpZGRlbjpZRVNdOwogCiAgICAg UmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0PiBzdHJvbmdUaGlzKHRoaXMp OwogICAgIFdlYlRocmVhZFJ1bihbc3Ryb25nVGhpc10gewotICAgICAgICBbc3Ryb25nVGhpcy0+ bV93aW5kb3cgc2V0SGlkZGVuOllFU107CiAgICAgICAgIGlmIChzdHJvbmdUaGlzLT5tX2Z1bGxz Y3JlZW5DaGFuZ2VPYnNlcnZlcikKICAgICAgICAgICAgIHN0cm9uZ1RoaXMtPm1fZnVsbHNjcmVl bkNoYW5nZU9ic2VydmVyLT5kaWRFbnRlckZ1bGxzY3JlZW4oKTsKICAgICB9KTsKIH0KIAordm9p ZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZmFpbGVkVG9TdGFydE9wdGltaXpl ZEZ1bGxzY3JlZW4oKQoreworICAgIExPRyhGdWxsc2NyZWVuLCAiV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ6OmZhaWxlZFRvU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCVwKSIsIHRo aXMpOworICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHNldFNob3dzUGxheWJhY2tDb250cm9s czpZRVNdOworCisgICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0PiBz dHJvbmdUaGlzKHRoaXMpOworICAgIFdlYlRocmVhZFJ1bihbc3Ryb25nVGhpcywgdGhpc10gewor ICAgICAgICBpZiAoaGFzTW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVl bk1vZGVTdGFuZGFyZCkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgbV9leGl0Q29t cGxldGVkID0gdHJ1ZTsKKworICAgICAgICBpZiAobV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXIp CisgICAgICAgICAgICBtX2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlci0+ZGlkRW50ZXJGdWxsc2Ny ZWVuKCk7CisKKyAgICAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwpCisgICAgICAgICAg ICBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5yZXF1ZXN0RXhpdEZ1bGxzY3JlZW4oKTsKKyAgICB9 KTsKK30KKwogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0b3BP cHRpbWl6ZWRGdWxsc2NyZWVuKCkKIHsKICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3RvcE9wdGltaXplZEZ1bGxzY3JlZW4oJXApIiwg dGhpcyk7CkBAIC0xMzExLDM1ICsxMzMwLDYgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdDo6ZGlkU3RvcE9wdGltaXplZEZ1bGxzY3JlZW4oKQogICAgIH0pOwogfQogCi12 b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsQ2FuY2VsT3B0aW1pemVk RnVsbHNjcmVlbigpCi17Ci0gICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdDo6d2lsbENhbmNlbE9wdGltaXplZEZ1bGxzY3JlZW4oJXApIiwgdGhpcyk7 Ci0gICAgW21fd2luZG93IHNldEhpZGRlbjpOT107Ci0gICAgW21fdmlkZW9MYXllckNvbnRhaW5l ciBzZXRCYWNrZ3JvdW5kQ29sb3I6W1tnZXRVSUNvbG9yQ2xhc3MoKSBjbGVhckNvbG9yXSBDR0Nv bG9yXV07Ci0gICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEJhY2tncm91bmRD b2xvcjpbZ2V0VUlDb2xvckNsYXNzKCkgY2xlYXJDb2xvcl1dOwotCi0gICAgUmVmUHRyPFdlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0PiBzdHJvbmdUaGlzKHRoaXMpOwotICAgIFdlYlRo cmVhZFJ1bihbc3Ryb25nVGhpc10gewotICAgICAgICBpZiAoc3Ryb25nVGhpcy0+bV92aWRlb0Z1 bGxzY3JlZW5Nb2RlbCkKLSAgICAgICAgICAgIHN0cm9uZ1RoaXMtPm1fdmlkZW9GdWxsc2NyZWVu TW9kZWwtPnJlcXVlc3RFeGl0RnVsbHNjcmVlbigpOwotICAgIH0pOwotfQotCi12b2lkIFdlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRDYW5jZWxPcHRpbWl6ZWRGdWxsc2NyZWVu KCkKLXsKLSAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpkaWRDYW5jZWxPcHRpbWl6ZWRGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOwotICAgIGlmICho YXNNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJk KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0PiBzdHJvbmdUaGlzKHRoaXMpOwotICAgIFdlYlRocmVhZFJ1bihbc3Ryb25nVGhp c10gewotICAgICAgICBzdHJvbmdUaGlzLT5jbGVhck1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1z OjpWaWRlb0Z1bGxzY3JlZW5Nb2RlT3B0aW1pemVkKTsKLSAgICAgICAgW3N0cm9uZ1RoaXMtPm1f d2luZG93IHNldEhpZGRlbjpZRVNdOwotICAgICAgICBpZiAoc3Ryb25nVGhpcy0+bV9mdWxsc2Ny ZWVuQ2hhbmdlT2JzZXJ2ZXIpCi0gICAgICAgICAgICBzdHJvbmdUaGlzLT5tX2Z1bGxzY3JlZW5D aGFuZ2VPYnNlcnZlci0+ZGlkRXhpdEZ1bGxzY3JlZW4oKTsKLSAgICB9KTsKLX0KLQogdm9pZCBX ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6cHJlcGFyZUZvck9wdGltaXplZEZ1bGxz Y3JlZW5TdG9wV2l0aENvbXBsZXRpb25IYW5kbGVyKHZvaWQgKF5jb21wbGV0aW9uSGFuZGxlciko Qk9PTCByZXN0b3JlZCkpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdDo6cHJlcGFyZUZvck9wdGltaXplZEZ1bGxzY3JlZW5TdG9wV2l0aENv bXBsZXRpb25IYW5kbGVyKCVwKSIsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9z cGkvY29jb2EvQVZLaXRTUEkuaAppbmRleCBjMTQ3NWJlZmJmNTM5YzY4YzUyNzY2MTg1YmVlY2M3 Y2YwZWJmM2YxLi5hYmRkY2UyNWM0ODgyZDIzZGQ0MjVlNmQ0NjA5ODQwMTkzOTVlMThjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2EvQVZLaXRTUEkuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2EvQVZLaXRTUEkuaApAQCAtODksNyAr ODksNiBAQCB0eXBlZGVmIE5TSW50ZWdlciBBVlBsYXllclZpZXdDb250cm9sbGVyT3B0aW1pemVk RnVsbHNjcmVlblN0b3BSZWFzb247CiAtICh2b2lkKWV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6KEJP T0wpYW5pbWF0ZWQgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKEJPT0wgc3VjY2VzcywgTlNF cnJvciAqKSljb21wbGV0aW9uSGFuZGxlcjsKIAogLSAodm9pZClzdGFydE9wdGltaXplZEZ1bGxz Y3JlZW47Ci0tICh2b2lkKXN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbldpdGhTdGFydENvbXBsZXRp b25IYW5kbGVyOih2b2lkICheKShCT09MIHN1Y2Nlc3MsIE5TRXJyb3IqKSlzdGFydENvbXBsZXRp b25IYW5kbGVyIHN0b3BDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoQVZQbGF5ZXJWaWV3Q29u dHJvbGxlck9wdGltaXplZEZ1bGxzY3JlZW5TdG9wUmVhc29uKSlzdG9wQ29tcGxldGlvbkhhbmRs ZXI7CiAtICh2b2lkKXN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuOwogLSAodm9pZClzZXRBbGxvd3NP cHRpbWl6ZWRGdWxsc2NyZWVuOihCT09MKWFsbG93c09wdGltaXplZEZ1bGxzY3JlZW47CiAK 253658 2015-05-24 10:18:58 -0700 2015-05-27 10:12:32 -0700 Patch bug-145340-20150524101850.patch text/plain 9200 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0ODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTgwZGYzZWJjMjlkMDRl MWQ5OWFlOTlhZDY0YTFjMjNmMWM1NzM3OS4uNGUwZmMyN2FlMWI1MTQ5ZWIwODQwY2Y3ZTIyZWY4 NWQzZDQwNzgxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA1LTIyICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBIYW5kbGUgY2FzZSB3aGVy ZSAtc3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuIGZhaWxzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MzQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG5ldyBBVlBsYXllclZpZXdDb250cm9sbGVy IGRlbGVnYXRlIG1ldGhvZHMgYW5kIHJlbW92ZSBvbGQgb25lcy4KKyAgICAgICAgLXN0YXJ0T3B0 aW1pemVkRnVsbHNjcmVlbiBjYW4gZWl0aGVyIGZhaWwgc2lsZW50bHkgYmVjYXVzZSBpdCBpcyBu b3QgYWxsb3dlZCBvciBpdCB3aWxsIGNhbGwgYSBkZWxlZ2F0ZS4KKyAgICAgICAgV2UgcHJldmVu dCBzaWxlbnQgZmFpbHVyZSBieSB0ZXN0aW5nIHByZWNvbmRpdGlvbnMgaW4gZW50ZXJGdWxsc2Ny ZWVuT3B0aW1pemVkLCBhbmQgYWRkIHRoZSAKKyAgICAgICAgZGVsZWdhdGUgLXBsYXllclZpZXdD b250cm9sbGVyRmFpbGVkVG9TdGFydE9wdGltaXplZEZ1bGxzY3JlZW4gdG8gaGFuZGxlIGV4cGxp Y2l0bHkgZmFpbHVyZS4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5oOiBhZGRlZC9yZW1vdmVkIG1ldGhvZCBkZWNsYXJhdGlvbnMuCisg ICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1t OiAKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJDb250cm9sbGVyIHBsYXllclZpZXdDb250cm9sbGVy RmFpbGVkVG9TdGFydE9wdGltaXplZEZ1bGxzY3JlZW46d2l0aEVycm9yOl0pOiBBZGRlZC4KKyAg ICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW5P cHRpbWl6ZWQpOiBIYW5kbGUgc2lsZW50IGZhaWx1cmUuCisgICAgICAgIChXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKTogSGlkZSB3 aW5kb3cgb24gbWFpbiB0aHJlYWQuCisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdDo6ZmFpbGVkVG9TdGFydE9wdGltaXplZEZ1bGxzY3JlZW4pOiBBZGRlZAorICAgICAg ICAoLVtXZWJBVlBsYXllckNvbnRyb2xsZXIgcGxheWVyVmlld0NvbnRyb2xsZXJXaWxsQ2FuY2Vs T3B0aW1pemVkRnVsbHNjcmVlbjpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJD b250cm9sbGVyIHBsYXllclZpZXdDb250cm9sbGVyRGlkQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVl bjpdKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 Ojp3aWxsQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVlbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVl bik6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmg6IFJl bW92ZSBkZWFkIFNQSS4gQWRkIGlzT3B0aW1pemVkRnVsbHNjcmVlblBvc3NpYmxlLgorCiAyMDE1 LTA1LTIzICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBQZXJt YW5lbnQgcmVkaXJlY3RzIHNob3VsZCBoYXZlIGxvbmcgaW1wbGljaXQgY2FjaGUgbGlmZXRpbWUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKaW5kZXggN2FkNjVkZDE4NWM4OWU0OThlNWQzODA1 ZjNjYWY1OWU5MTMyMjBiOS4uYmQwYzcyZGQ0ZTEyNWQxN2UxNTlmNGI3NmY5OWViOTM3ZTQ5ZDhl ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKQEAgLTEwNywxMCArMTA3LDkgQEAgcHVi bGljOgogCiAgICAgdm9pZCB3aWxsU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCk7CiAgICAgdm9p ZCBkaWRTdGFydE9wdGltaXplZEZ1bGxzY3JlZW4oKTsKKyAgICB2b2lkIGZhaWxlZFRvU3RhcnRP cHRpbWl6ZWRGdWxsc2NyZWVuKCk7CiAgICAgdm9pZCB3aWxsU3RvcE9wdGltaXplZEZ1bGxzY3Jl ZW4oKTsKICAgICB2b2lkIGRpZFN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuKCk7Ci0gICAgdm9pZCB3 aWxsQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVlbigpOwotICAgIHZvaWQgZGlkQ2FuY2VsT3B0aW1p emVkRnVsbHNjcmVlbigpOwogICAgIHZvaWQgcHJlcGFyZUZvck9wdGltaXplZEZ1bGxzY3JlZW5T dG9wV2l0aENvbXBsZXRpb25IYW5kbGVyKHZvaWQgKF4pKEJPT0wpKTsKIAogICAgIHZvaWQgc2V0 TW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IDM1ZTc4NjRkNWRhNDRjZTU5NDViZDdhMjUxMDRj ZDVkNDRlYTVhMjkuLjhkYTZlY2FiN2QyMWZmZDk4OTBkYjRkYWZjZjQxZTllNWNlOWIxMGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTIwNCw2ICsyMDQsMTMgQEAgc3RhdGlj IGNvbnN0IGNoYXIqIGJvb2xTdHJpbmcoYm9vbCB2YWwpCiAgICAgc2VsZi5mdWxsc2NyZWVuSW50 ZXJmYWNlLT5kaWRTdGFydE9wdGltaXplZEZ1bGxzY3JlZW4oKTsKIH0KIAorLSAodm9pZClwbGF5 ZXJWaWV3Q29udHJvbGxlckZhaWxlZFRvU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuOihBVlBsYXll clZpZXdDb250cm9sbGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIgd2l0aEVycm9yOihOU0Vycm9y ICopZXJyb3IKK3sKKyAgICBVTlVTRURfUEFSQU0ocGxheWVyVmlld0NvbnRyb2xsZXIpOworICAg IFVOVVNFRF9QQVJBTShlcnJvcik7CisgICAgc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlLT5mYWls ZWRUb1N0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbigpOworfQorCiAtICh2b2lkKXBsYXllclZpZXdD b250cm9sbGVyV2lsbFN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuOihBVlBsYXllclZpZXdDb250cm9s bGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIKIHsKICAgICBVTlVTRURfUEFSQU0ocGxheWVyVmll d0NvbnRyb2xsZXIpOwpAQCAtMjE2LDE4ICsyMjMsNiBAQCBzdGF0aWMgY29uc3QgY2hhciogYm9v bFN0cmluZyhib29sIHZhbCkKICAgICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPmRpZFN0b3BP cHRpbWl6ZWRGdWxsc2NyZWVuKCk7CiB9CiAKLS0gKHZvaWQpcGxheWVyVmlld0NvbnRyb2xsZXJX aWxsQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVlbjooQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBs YXllclZpZXdDb250cm9sbGVyCi17Ci0gICAgVU5VU0VEX1BBUkFNKHBsYXllclZpZXdDb250cm9s bGVyKTsKLSAgICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPndpbGxDYW5jZWxPcHRpbWl6ZWRG dWxsc2NyZWVuKCk7Ci19Ci0KLS0gKHZvaWQpcGxheWVyVmlld0NvbnRyb2xsZXJEaWRDYW5jZWxP cHRpbWl6ZWRGdWxsc2NyZWVuOihBVlBsYXllclZpZXdDb250cm9sbGVyICopcGxheWVyVmlld0Nv bnRyb2xsZXIKLXsKLSAgICBVTlVTRURfUEFSQU0ocGxheWVyVmlld0NvbnRyb2xsZXIpOwotICAg IHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+ZGlkQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVlbigp OwotfQotCiAtIChCT09MKXBsYXllclZpZXdDb250cm9sbGVyOihBVlBsYXllclZpZXdDb250cm9s bGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIgc2hvdWxkRXhpdEZ1bGxTY3JlZW5XaXRoUmVhc29u OihBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb24pcmVhc29uCiB7CiAg ICAgVU5VU0VEX1BBUkFNKHBsYXllclZpZXdDb250cm9sbGVyKTsKQEAgLTEwMzMsNyArMTAyOCwx MSBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3Jl ZW5PcHRpbWl6ZWQoKQogICAgIFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dD4gc3Ryb25nVGhpcyh0aGlzKTsKIAogICAgIExPRyhGdWxsc2NyZWVuLCAiV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlbk9wdGltaXplZCglcCkiLCB0aGlz KTsKLSAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBzdGFydE9wdGltaXplZEZ1bGxzY3JlZW5d OworICAgIAorICAgIGlmIChbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBpc09wdGltaXplZEZ1bGxz Y3JlZW5Qb3NzaWJsZV0pCisgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0YXJ0T3B0 aW1pemVkRnVsbHNjcmVlbl07CisgICAgZWxzZQorICAgICAgICBmYWlsZWRUb1N0YXJ0T3B0aW1p emVkRnVsbHNjcmVlbigpOwogfQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjplbnRlckZ1bGxzY3JlZW5TdGFuZGFyZCgpCkBAIC0xMjcwLDE1ICsxMjY5LDM1IEBAIHZv aWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0YXJ0T3B0aW1pemVkRnVs bHNjcmVlbigpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdDo6ZGlkU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOwogICAg IFttX3BsYXllclZpZXdDb250cm9sbGVyIHNldFNob3dzUGxheWJhY2tDb250cm9sczpZRVNdOwor ICAgIFttX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKIAogICAgIFJlZlB0cjxXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdD4gc3Ryb25nVGhpcyh0aGlzKTsKICAgICBXZWJUaHJlYWRSdW4o W3N0cm9uZ1RoaXNdIHsKLSAgICAgICAgW3N0cm9uZ1RoaXMtPm1fd2luZG93IHNldEhpZGRlbjpZ RVNdOwogICAgICAgICBpZiAoc3Ryb25nVGhpcy0+bV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXIp CiAgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlci0+ZGlk RW50ZXJGdWxsc2NyZWVuKCk7CiAgICAgfSk7CiB9CiAKK3ZvaWQgV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ6OmZhaWxlZFRvU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuKCkKK3sKKyAg ICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpmYWls ZWRUb1N0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbiglcCkiLCB0aGlzKTsKKyAgICBbbV9wbGF5ZXJW aWV3Q29udHJvbGxlciBzZXRTaG93c1BsYXliYWNrQ29udHJvbHM6WUVTXTsKKworICAgIFJlZlB0 cjxXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdD4gc3Ryb25nVGhpcyh0aGlzKTsKKyAg ICBXZWJUaHJlYWRSdW4oW3N0cm9uZ1RoaXMsIHRoaXNdIHsKKyAgICAgICAgaWYgKGhhc01vZGUo SFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3RhbmRhcmQpKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIG1fZXhpdENvbXBsZXRlZCA9IHRydWU7CisKKyAg ICAgICAgaWYgKG1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyKQorICAgICAgICAgICAgbV9mdWxs c2NyZWVuQ2hhbmdlT2JzZXJ2ZXItPmRpZEVudGVyRnVsbHNjcmVlbigpOworCisgICAgICAgIGlm IChtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsKQorICAgICAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5N b2RlbC0+cmVxdWVzdEV4aXRGdWxsc2NyZWVuKCk7CisgICAgfSk7Cit9CisKIHZvaWQgV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdG9wT3B0aW1pemVkRnVsbHNjcmVlbigp CiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dDo6d2lsbFN0b3BPcHRpbWl6ZWRGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOwpAQCAtMTMxMSwzNSAr MTMzMCw2IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0b3BP cHRpbWl6ZWRGdWxsc2NyZWVuKCkKICAgICB9KTsKIH0KIAotdm9pZCBXZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdDo6d2lsbENhbmNlbE9wdGltaXplZEZ1bGxzY3JlZW4oKQotewotICAg IExPRyhGdWxsc2NyZWVuLCAiV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxD YW5jZWxPcHRpbWl6ZWRGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOwotICAgIFttX3dpbmRvdyBzZXRI aWRkZW46Tk9dOwotICAgIFttX3ZpZGVvTGF5ZXJDb250YWluZXIgc2V0QmFja2dyb3VuZENvbG9y OltbZ2V0VUlDb2xvckNsYXNzKCkgY2xlYXJDb2xvcl0gQ0dDb2xvcl1dOwotICAgIFtbbV9wbGF5 ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXRCYWNrZ3JvdW5kQ29sb3I6W2dldFVJQ29sb3JDbGFz cygpIGNsZWFyQ29sb3JdXTsKLQotICAgIFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdD4gc3Ryb25nVGhpcyh0aGlzKTsKLSAgICBXZWJUaHJlYWRSdW4oW3N0cm9uZ1RoaXNd IHsKLSAgICAgICAgaWYgKHN0cm9uZ1RoaXMtPm1fdmlkZW9GdWxsc2NyZWVuTW9kZWwpCi0gICAg ICAgICAgICBzdHJvbmdUaGlzLT5tX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5yZXF1ZXN0RXhpdEZ1 bGxzY3JlZW4oKTsKLSAgICB9KTsKLX0KLQotdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdDo6ZGlkQ2FuY2VsT3B0aW1pemVkRnVsbHNjcmVlbigpCi17Ci0gICAgTE9HKEZ1bGxz Y3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkQ2FuY2VsT3B0aW1p emVkRnVsbHNjcmVlbiglcCkiLCB0aGlzKTsKLSAgICBpZiAoaGFzTW9kZShIVE1MTWVkaWFFbGVt ZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkpCi0gICAgICAgIHJldHVybjsK LQotICAgIFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdD4gc3Ryb25nVGhp cyh0aGlzKTsKLSAgICBXZWJUaHJlYWRSdW4oW3N0cm9uZ1RoaXNdIHsKLSAgICAgICAgc3Ryb25n VGhpcy0+Y2xlYXJNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9k ZU9wdGltaXplZCk7Ci0gICAgICAgIFtzdHJvbmdUaGlzLT5tX3dpbmRvdyBzZXRIaWRkZW46WUVT XTsKLSAgICAgICAgaWYgKHN0cm9uZ1RoaXMtPm1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyKQot ICAgICAgICAgICAgc3Ryb25nVGhpcy0+bV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXItPmRpZEV4 aXRGdWxsc2NyZWVuKCk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQ6OnByZXBhcmVGb3JPcHRpbWl6ZWRGdWxsc2NyZWVuU3RvcFdpdGhDb21wbGV0 aW9uSGFuZGxlcih2b2lkICheY29tcGxldGlvbkhhbmRsZXIpKEJPT0wgcmVzdG9yZWQpKQogewog ICAgIExPRyhGdWxsc2NyZWVuLCAiV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnBy ZXBhcmVGb3JPcHRpbWl6ZWRGdWxsc2NyZWVuU3RvcFdpdGhDb21wbGV0aW9uSGFuZGxlciglcCki LCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9B VktpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgK aW5kZXggYzE0NzViZWZiZjUzOWM2OGM1Mjc2NjE4NWJlZWNjN2NmMGViZjNmMS4uYjdjZDMxM2Y4 MTFhMmY0MjU5ODkxZTg0ZDM0MjZhNjE1MGU1OTQwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKQEAgLTg4LDggKzg4LDggQEAgdHlwZWRlZiBOU0lu dGVnZXIgQVZQbGF5ZXJWaWV3Q29udHJvbGxlck9wdGltaXplZEZ1bGxzY3JlZW5TdG9wUmVhc29u OwogLSAodm9pZCllbnRlckZ1bGxTY3JlZW5BbmltYXRlZDooQk9PTClhbmltYXRlZCBjb21wbGV0 aW9uSGFuZGxlcjoodm9pZCAoXikoQk9PTCBzdWNjZXNzLCBOU0Vycm9yICopKWNvbXBsZXRpb25I YW5kbGVyOwogLSAodm9pZClleGl0RnVsbFNjcmVlbkFuaW1hdGVkOihCT09MKWFuaW1hdGVkIGNv bXBsZXRpb25IYW5kbGVyOih2b2lkICheKShCT09MIHN1Y2Nlc3MsIE5TRXJyb3IgKikpY29tcGxl dGlvbkhhbmRsZXI7CiAKKy0gKEJPT0wpaXNPcHRpbWl6ZWRGdWxsc2NyZWVuUG9zc2libGU7CiAt ICh2b2lkKXN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbjsKLS0gKHZvaWQpc3RhcnRPcHRpbWl6ZWRG dWxsc2NyZWVuV2l0aFN0YXJ0Q29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKEJPT0wgc3VjY2Vz cywgTlNFcnJvciopKXN0YXJ0Q29tcGxldGlvbkhhbmRsZXIgc3RvcENvbXBsZXRpb25IYW5kbGVy Oih2b2lkICheKShBVlBsYXllclZpZXdDb250cm9sbGVyT3B0aW1pemVkRnVsbHNjcmVlblN0b3BS ZWFzb24pKXN0b3BDb21wbGV0aW9uSGFuZGxlcjsKIC0gKHZvaWQpc3RvcE9wdGltaXplZEZ1bGxz Y3JlZW47CiAtICh2b2lkKXNldEFsbG93c09wdGltaXplZEZ1bGxzY3JlZW46KEJPT0wpYWxsb3dz T3B0aW1pemVkRnVsbHNjcmVlbjsKIAo=