172145 2017-05-15 16:53:06 -0700 Captions and subtitles not showing up in picture-in-picture for MSE content. 2017-11-02 11:44:09 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson jer.noble webkit-bug-importer oldest_to_newest 1308868 0 jeremyj-wk 2017-05-15 16:53:06 -0700 Captions and subtitles not showing up in picture-in-picture for MSE content. 1308869 1 jeremyj-wk 2017-05-15 16:53:48 -0700 rdar://problem/28738340 1308872 2 310188 jeremyj-wk 2017-05-15 16:58:03 -0700 Created attachment 310188 Patch 1308957 3 310188 eric.carlson 2017-05-15 20:25:40 -0700 Comment on attachment 310188 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310188&action=review > Source/WebCore/ChangeLog:11 > + This movest the TextTrackRepresentation platfrom layer into the fullscreen container layer when going into Nit: movest > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:938 > + FloatRect videoFullscreenFrame = m_videoFullscreenLayerManager->videoFullscreenFrame(); Nit: auto > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:939 > + CGRect videoRect = [m_sampleBufferDisplayLayer bounds]; Ditto > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:940 > + CGRect textFrame = m_sampleBufferDisplayLayer ? videoRect : CGRectMake(0, 0, videoFullscreenFrame.width(), videoFullscreenFrame.height()); Ditto 1309301 4 310188 jeremyj-wk 2017-05-16 14:34:58 -0700 Comment on attachment 310188 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310188&action=review >> Source/WebCore/ChangeLog:11 >> + This movest the TextTrackRepresentation platfrom layer into the fullscreen container layer when going into > > Nit: movest Fixed. >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:938 >> + FloatRect videoFullscreenFrame = m_videoFullscreenLayerManager->videoFullscreenFrame(); > > Nit: auto Done. >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:939 >> + CGRect videoRect = [m_sampleBufferDisplayLayer bounds]; > > Ditto Done. >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:940 >> + CGRect textFrame = m_sampleBufferDisplayLayer ? videoRect : CGRectMake(0, 0, videoFullscreenFrame.width(), videoFullscreenFrame.height()); > > Ditto Done. 1309302 5 310298 jeremyj-wk 2017-05-16 14:35:39 -0700 Created attachment 310298 Patch for landing. 1309338 6 310298 commit-queue 2017-05-16 15:27:16 -0700 Comment on attachment 310298 Patch for landing. Clearing flags on attachment: 310298 Committed r216951: <http://trac.webkit.org/changeset/216951> 310188 2017-05-15 16:58:03 -0700 2017-05-15 20:25:40 -0700 Patch bug-172145-20170515165802.patch text/plain 7116 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjk5MDQ2YzYwN2ExYTFl NTI4M2QxZGU3NzU5Mzk5ZGUxNjlhZmNjYi4uYjE1NTAxYmM5MGNlYjMwMmFlOGRmNGU1ODg2NThl MTVhMjMzZGUyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA1LTE1ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBDYXB0aW9ucyBhbmQgc3Vi dGl0bGVzIG5vdCBzaG93aW5nIHVwIGluIHBpY3R1cmUtaW4tcGljdHVyZSBmb3IgTVNFIGNvbnRl bnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzIx NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMgYXMgdGhpcyBoYXMgbm8gYWZmZWN0IG9uIHRoZSBET00uCisKKyAgICAgICAgQWRk IFRleHRUcmFja1JlcHJlc2VudGF0aW9uIGNvZGUgZnJvbSBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmogdG8gTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpjLgorICAg ICAgICBUaGlzIG1vdmVzdCB0aGUgVGV4dFRyYWNrUmVwcmVzZW50YXRpb24gcGxhdGZyb20gbGF5 ZXIgaW50byB0aGUgZnVsbHNjcmVlbiBjb250YWluZXIgbGF5ZXIgd2hlbiBnb2luZyBpbnRvCisg ICAgICAgIHBpcCBmb3IgZnVsbHNjcmVlbiwgYWxsb3dpbmcgdGhlIGNhcHRpb25zIHRvIGJlIHZp c2libGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJj ZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakM6OmVuc3VyZUxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6c2V0VmlkZW9GdWxsc2NyZWVuTGF5ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRW aWRlb0Z1bGxzY3JlZW5GcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVNZWRpYVNvdXJjZUFWRk9iakM6OnJlcXVpcmVzVGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpz eW5jVGV4dFRyYWNrQm91bmRzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU291cmNlQVZGT2JqQzo6c2V0VGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOgorCiAyMDE3 LTA1LTAzICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAg IFtNZWRpYVN0cmVhbV0gQWxsb3cgaG9zdCBhcHBsaWNhdGlvbiB0byBlbmFibGUvZGlzYWJsZSBt ZWRpYSBjYXB0dXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCmluZGV4IDU5NWRhMDNlZWIwMWZm NGM1NTg5OTRmOWE2Y2UyNjNjYjQxMGZlNmUuLmJhYTczNzgyOGY4OTQ2MTljNTRlOGJiYThlMDYx NmFjMjAwYmM5NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCkBAIC05Niw2ICs5NiwxMiBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShGbG9hdFJlY3QpIG92 ZXJyaWRlOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoVklERU9fVFJBQ0spCisgICAgYm9vbCByZXF1 aXJlc1RleHRUcmFja1JlcHJlc2VudGF0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgdm9pZCBz ZXRUZXh0VHJhY2tSZXByZXNlbnRhdGlvbihUZXh0VHJhY2tSZXByZXNlbnRhdGlvbiopIG92ZXJy aWRlOworICAgIHZvaWQgc3luY1RleHRUcmFja0JvdW5kcygpIG92ZXJyaWRlOworI2VuZGlmCisg ICAgCiAjaWYgRU5BQkxFKExFR0FDWV9FTkNSWVBURURfTUVESUEpCiAgICAgYm9vbCBoYXNTdHJl YW1TZXNzaW9uKCkgeyByZXR1cm4gbV9zdHJlYW1TZXNzaW9uOyB9CiAgICAgQVZTdHJlYW1TZXNz aW9uICpzdHJlYW1TZXNzaW9uKCk7CkBAIC0yNDIsNiArMjQ4LDcgQEAgcHJpdmF0ZToKICAgICBt dXRhYmxlIGJvb2wgbV9sb2FkaW5nUHJvZ3Jlc3NlZDsKICAgICBib29sIG1faGFzQXZhaWxhYmxl VmlkZW9GcmFtZTsKICAgICBib29sIG1fYWxsUmVuZGVyZXJzSGF2ZUF2YWlsYWJsZVNhbXBsZXMg eyBmYWxzZSB9OworICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3RleHRUcmFja1JlcHJl c2VudGF0aW9uTGF5ZXI7CiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKICAg ICBSZWZQdHI8TWVkaWFQbGF5YmFja1RhcmdldD4gbV9wbGF5YmFja1RhcmdldDsKICAgICBib29s IG1fc2hvdWxkUGxheVRvVGFyZ2V0IHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU291cmNlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5t bQppbmRleCBhM2E0NTEyMWMwYTc3MjE5YTIxMzJlNmM5ZTc1NjFjYTAwZWRjMjRiLi4yOWU4Mjgy ZmEwOTdmMGM3MDEwZGU4NDYwMGJkODcyM2JhNDUwODhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVNZWRpYVNvdXJjZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZP YmpDLm1tCkBAIC0zOCw2ICszOCw3IEBACiAjaW1wb3J0ICJNZWRpYVNvdXJjZVByaXZhdGVDbGll bnQuaCIKICNpbXBvcnQgIk1lZGlhVGltZUFWRm91bmRhdGlvbi5oIgogI2ltcG9ydCAiUGxhdGZv cm1DbG9ja0NNLmgiCisjaW1wb3J0ICJUZXh0VHJhY2tSZXByZXNlbnRhdGlvbi5oIgogI2ltcG9y dCAiV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIgogI2ltcG9ydCA8QVZGb3VuZGF0aW9uL0FWQXNz ZXQuaD4KICNpbXBvcnQgPEFWRm91bmRhdGlvbi9BVlRpbWUuaD4KQEAgLTYwNyw2ICs2MDgsMTAg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmVuc3VyZUxheWVy KCkKICNlbmRpZgogCiAgICAgW21fc3luY2hyb25pemVyIGFkZFJlbmRlcmVyOm1fc2FtcGxlQnVm ZmVyRGlzcGxheUxheWVyLmdldCgpXTsKKyAgICAKKyNpZiBQTEFURk9STShNQUMpICYmIEVOQUJM RShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyAgICBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFu YWdlci0+c2V0VmlkZW9MYXllcihtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKSwgc25h cHBlZEludFJlY3QobV9wbGF5ZXItPmNsaWVudCgpLm1lZGlhUGxheWVyQ29udGVudEJveFJlY3Qo KSkuc2l6ZSgpKTsKKyNlbmRpZgogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291 cmNlQVZGT2JqQzo6ZGVzdHJveUxheWVyKCkKQEAgLTg5NSwxNCArOTAwLDcyIEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpjaGFyYWN0ZXJpc3RpY3NDaGFuZ2Vk KCkKICNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkK IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRWaWRlb0Z1bGxz Y3JlZW5MYXllcihQbGF0Zm9ybUxheWVyICp2aWRlb0Z1bGxzY3JlZW5MYXllciwgc3RkOjpmdW5j dGlvbjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVyKQogeworICAgIGlmIChtX3ZpZGVvRnVsbHNj cmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2NyZWVuTGF5ZXIoKSA9PSB2aWRlb0Z1bGxzY3Jl ZW5MYXllcikgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgICAgICByZXR1cm47 CisgICAgfQorICAgIAogICAgIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLT5zZXRWaWRl b0Z1bGxzY3JlZW5MYXllcih2aWRlb0Z1bGxzY3JlZW5MYXllciwgY29tcGxldGlvbkhhbmRsZXIp OworICAgIAorICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxs c2NyZWVuTGF5ZXIoKSAmJiBtX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIpIHsKKyAgICAg ICAgc3luY1RleHRUcmFja0JvdW5kcygpOworICAgICAgICBbbV92aWRlb0Z1bGxzY3JlZW5MYXll ck1hbmFnZXItPnZpZGVvRnVsbHNjcmVlbkxheWVyKCkgYWRkU3VibGF5ZXI6bV90ZXh0VHJhY2tS ZXByZXNlbnRhdGlvbkxheWVyLmdldCgpXTsKKyAgICB9CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShGbG9hdFJl Y3QgZnJhbWUpCiB7CiAgICAgbV92aWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXItPnNldFZpZGVv RnVsbHNjcmVlbkZyYW1lKGZyYW1lKTsKKyAgICBzeW5jVGV4dFRyYWNrQm91bmRzKCk7CiB9CiAj ZW5kaWYKKyAgICAKK2Jvb2wgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpy ZXF1aXJlc1RleHRUcmFja1JlcHJlc2VudGF0aW9uKCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJ T1MpIHx8IChQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkp CisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLT52aWRlb0Z1bGxzY3JlZW5M YXllcigpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgorICAgIHJldHVybiBmYWxzZTsK K30KKyAgICAKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzeW5j VGV4dFRyYWNrQm91bmRzKCkKK3sKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMp ICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCisgICAgaWYgKCFtX3ZpZGVvRnVs bHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2NyZWVuTGF5ZXIoKSB8fCAhbV90ZXh0VHJh Y2tSZXByZXNlbnRhdGlvbkxheWVyKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgRmxvYXRS ZWN0IHZpZGVvRnVsbHNjcmVlbkZyYW1lID0gbV92aWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXIt PnZpZGVvRnVsbHNjcmVlbkZyYW1lKCk7CisgICAgQ0dSZWN0IHZpZGVvUmVjdCA9IFttX3NhbXBs ZUJ1ZmZlckRpc3BsYXlMYXllciBib3VuZHNdOworICAgIENHUmVjdCB0ZXh0RnJhbWUgPSBtX3Nh bXBsZUJ1ZmZlckRpc3BsYXlMYXllciA/IHZpZGVvUmVjdCA6IENHUmVjdE1ha2UoMCwgMCwgdmlk ZW9GdWxsc2NyZWVuRnJhbWUud2lkdGgoKSwgdmlkZW9GdWxsc2NyZWVuRnJhbWUuaGVpZ2h0KCkp OworICAgIFttX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIgc2V0RnJhbWU6dGV4dEZyYW1l XTsKKyNlbmRpZgorfQorICAgIAordm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFW Rk9iakM6OnNldFRleHRUcmFja1JlcHJlc2VudGF0aW9uKFRleHRUcmFja1JlcHJlc2VudGF0aW9u KiByZXByZXNlbnRhdGlvbikKK3sKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMp ICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCisgICAgUGxhdGZvcm1MYXllciog cmVwcmVzZW50YXRpb25MYXllciA9IHJlcHJlc2VudGF0aW9uID8gcmVwcmVzZW50YXRpb24tPnBs YXRmb3JtTGF5ZXIoKSA6IG5pbDsKKyAgICBpZiAocmVwcmVzZW50YXRpb25MYXllciA9PSBtX3Rl eHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIpIHsKKyAgICAgICAgc3luY1RleHRUcmFja0JvdW5k cygpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAorICAgIGlmIChtX3RleHRUcmFja1Jl cHJlc2VudGF0aW9uTGF5ZXIpCisgICAgICAgIFttX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5 ZXIgcmVtb3ZlRnJvbVN1cGVybGF5ZXJdOworICAgIAorICAgIG1fdGV4dFRyYWNrUmVwcmVzZW50 YXRpb25MYXllciA9IHJlcHJlc2VudGF0aW9uTGF5ZXI7CisgICAgCisgICAgaWYgKG1fdmlkZW9G dWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLT52aWRlb0Z1bGxzY3JlZW5MYXllcigpICYmIG1fdGV4dFRy YWNrUmVwcmVzZW50YXRpb25MYXllcikgeworICAgICAgICBzeW5jVGV4dFRyYWNrQm91bmRzKCk7 CisgICAgICAgIFttX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2NyZWVu TGF5ZXIoKSBhZGRTdWJsYXllcjptX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIuZ2V0KCld OworICAgIH0KKyAgICAKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHJlcHJlc2VudGF0aW9uKTsK KyNlbmRpZgorfQorICAgIAogCiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkK IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRXaXJlbGVzc1Bs YXliYWNrVGFyZ2V0KFJlZjxNZWRpYVBsYXliYWNrVGFyZ2V0PiYmIHRhcmdldCkK 310298 2017-05-16 14:35:39 -0700 2017-05-16 15:27:16 -0700 Patch for landing. bug-172145-20170516143539.patch text/plain 7104 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjk5MDQ2YzYwN2ExYTFl NTI4M2QxZGU3NzU5Mzk5ZGUxNjlhZmNjYi4uNWI3ZjYwYmJmYTk4N2MyZjNjMTExYmJhMmUwMGJl ZTEyNDBhOTc4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA1LTE1ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBDYXB0aW9ucyBhbmQgc3Vi dGl0bGVzIG5vdCBzaG93aW5nIHVwIGluIHBpY3R1cmUtaW4tcGljdHVyZSBmb3IgTVNFIGNvbnRl bnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzIx NDUKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGFzIHRoaXMgaGFzIG5vIGFmZmVjdCBvbiB0aGUgRE9NLgorCisgICAgICAgIEFkZCBU ZXh0VHJhY2tSZXByZXNlbnRhdGlvbiBjb2RlIGZyb20gTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqIHRvIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqYy4KKyAgICAg ICAgVGhpcyBtb3ZlcyB0aGUgVGV4dFRyYWNrUmVwcmVzZW50YXRpb24gcGxhdGZyb20gbGF5ZXIg aW50byB0aGUgZnVsbHNjcmVlbiBjb250YWluZXIgbGF5ZXIgd2hlbiBnb2luZyBpbnRvCisgICAg ICAgIHBpcCBmb3IgZnVsbHNjcmVlbiwgYWxsb3dpbmcgdGhlIGNhcHRpb25zIHRvIGJlIHZpc2li bGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRp YVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFW Rk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJj ZUFWRk9iakM6OmVuc3VyZUxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6c2V0VmlkZW9GdWxsc2NyZWVuTGF5ZXIpOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRWaWRl b0Z1bGxzY3JlZW5GcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVN ZWRpYVNvdXJjZUFWRk9iakM6OnJlcXVpcmVzVGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzeW5j VGV4dFRyYWNrQm91bmRzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU291cmNlQVZGT2JqQzo6c2V0VGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOgorCiAyMDE3LTA1 LTAzICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtN ZWRpYVN0cmVhbV0gQWxsb3cgaG9zdCBhcHBsaWNhdGlvbiB0byBlbmFibGUvZGlzYWJsZSBtZWRp YSBjYXB0dXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCmluZGV4IDU5NWRhMDNlZWIwMWZmNGM1 NTg5OTRmOWE2Y2UyNjNjYjQxMGZlNmUuLmJhYTczNzgyOGY4OTQ2MTljNTRlOGJiYThlMDYxNmFj MjAwYmM5NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCkBAIC05Niw2ICs5NiwxMiBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShGbG9hdFJlY3QpIG92ZXJy aWRlOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoVklERU9fVFJBQ0spCisgICAgYm9vbCByZXF1aXJl c1RleHRUcmFja1JlcHJlc2VudGF0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgdm9pZCBzZXRU ZXh0VHJhY2tSZXByZXNlbnRhdGlvbihUZXh0VHJhY2tSZXByZXNlbnRhdGlvbiopIG92ZXJyaWRl OworICAgIHZvaWQgc3luY1RleHRUcmFja0JvdW5kcygpIG92ZXJyaWRlOworI2VuZGlmCisgICAg CiAjaWYgRU5BQkxFKExFR0FDWV9FTkNSWVBURURfTUVESUEpCiAgICAgYm9vbCBoYXNTdHJlYW1T ZXNzaW9uKCkgeyByZXR1cm4gbV9zdHJlYW1TZXNzaW9uOyB9CiAgICAgQVZTdHJlYW1TZXNzaW9u ICpzdHJlYW1TZXNzaW9uKCk7CkBAIC0yNDIsNiArMjQ4LDcgQEAgcHJpdmF0ZToKICAgICBtdXRh YmxlIGJvb2wgbV9sb2FkaW5nUHJvZ3Jlc3NlZDsKICAgICBib29sIG1faGFzQXZhaWxhYmxlVmlk ZW9GcmFtZTsKICAgICBib29sIG1fYWxsUmVuZGVyZXJzSGF2ZUF2YWlsYWJsZVNhbXBsZXMgeyBm YWxzZSB9OworICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3RleHRUcmFja1JlcHJlc2Vu dGF0aW9uTGF5ZXI7CiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKICAgICBS ZWZQdHI8TWVkaWFQbGF5YmFja1RhcmdldD4gbV9wbGF5YmFja1RhcmdldDsKICAgICBib29sIG1f c2hvdWxkUGxheVRvVGFyZ2V0IHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU291cmNlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQpp bmRleCBhM2E0NTEyMWMwYTc3MjE5YTIxMzJlNmM5ZTc1NjFjYTAwZWRjMjRiLi5kNDZhODg0MDFi NjgyYmQ5YmJiYjdhOWUzZGEzNTdkNTJkYTNjY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVN ZWRpYVNvdXJjZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpD Lm1tCkBAIC0zOCw2ICszOCw3IEBACiAjaW1wb3J0ICJNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQu aCIKICNpbXBvcnQgIk1lZGlhVGltZUFWRm91bmRhdGlvbi5oIgogI2ltcG9ydCAiUGxhdGZvcm1D bG9ja0NNLmgiCisjaW1wb3J0ICJUZXh0VHJhY2tSZXByZXNlbnRhdGlvbi5oIgogI2ltcG9ydCAi V2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIgogI2ltcG9ydCA8QVZGb3VuZGF0aW9uL0FWQXNzZXQu aD4KICNpbXBvcnQgPEFWRm91bmRhdGlvbi9BVlRpbWUuaD4KQEAgLTYwNyw2ICs2MDgsMTAgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmVuc3VyZUxheWVyKCkK ICNlbmRpZgogCiAgICAgW21fc3luY2hyb25pemVyIGFkZFJlbmRlcmVyOm1fc2FtcGxlQnVmZmVy RGlzcGxheUxheWVyLmdldCgpXTsKKyAgICAKKyNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShW SURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyAgICBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdl ci0+c2V0VmlkZW9MYXllcihtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKSwgc25hcHBl ZEludFJlY3QobV9wbGF5ZXItPmNsaWVudCgpLm1lZGlhUGxheWVyQ29udGVudEJveFJlY3QoKSku c2l6ZSgpKTsKKyNlbmRpZgogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNl QVZGT2JqQzo6ZGVzdHJveUxheWVyKCkKQEAgLTg5NSwxNCArOTAwLDcyIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpjaGFyYWN0ZXJpc3RpY3NDaGFuZ2VkKCkK ICNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3Jl ZW5MYXllcihQbGF0Zm9ybUxheWVyICp2aWRlb0Z1bGxzY3JlZW5MYXllciwgc3RkOjpmdW5jdGlv bjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVyKQogeworICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVl bkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2NyZWVuTGF5ZXIoKSA9PSB2aWRlb0Z1bGxzY3JlZW5M YXllcikgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgICAgICByZXR1cm47Cisg ICAgfQorICAgIAogICAgIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLT5zZXRWaWRlb0Z1 bGxzY3JlZW5MYXllcih2aWRlb0Z1bGxzY3JlZW5MYXllciwgY29tcGxldGlvbkhhbmRsZXIpOwor ICAgIAorICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2Ny ZWVuTGF5ZXIoKSAmJiBtX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIpIHsKKyAgICAgICAg c3luY1RleHRUcmFja0JvdW5kcygpOworICAgICAgICBbbV92aWRlb0Z1bGxzY3JlZW5MYXllck1h bmFnZXItPnZpZGVvRnVsbHNjcmVlbkxheWVyKCkgYWRkU3VibGF5ZXI6bV90ZXh0VHJhY2tSZXBy ZXNlbnRhdGlvbkxheWVyLmdldCgpXTsKKyAgICB9CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShGbG9hdFJlY3Qg ZnJhbWUpCiB7CiAgICAgbV92aWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXItPnNldFZpZGVvRnVs bHNjcmVlbkZyYW1lKGZyYW1lKTsKKyAgICBzeW5jVGV4dFRyYWNrQm91bmRzKCk7CiB9CiAjZW5k aWYKKyAgICAKK2Jvb2wgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpyZXF1 aXJlc1RleHRUcmFja1JlcHJlc2VudGF0aW9uKCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJT1Mp IHx8IChQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCisg ICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLT52aWRlb0Z1bGxzY3JlZW5MYXll cigpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgorICAgIHJldHVybiBmYWxzZTsKK30K KyAgICAKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzeW5jVGV4 dFRyYWNrQm91bmRzKCkKK3sKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMpICYm IEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCisgICAgaWYgKCFtX3ZpZGVvRnVsbHNj cmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2NyZWVuTGF5ZXIoKSB8fCAhbV90ZXh0VHJhY2tS ZXByZXNlbnRhdGlvbkxheWVyKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgYXV0byB2aWRl b0Z1bGxzY3JlZW5GcmFtZSA9IG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyLT52aWRlb0Z1 bGxzY3JlZW5GcmFtZSgpOworICAgIGF1dG8gdmlkZW9SZWN0ID0gW21fc2FtcGxlQnVmZmVyRGlz cGxheUxheWVyIGJvdW5kc107CisgICAgYXV0byB0ZXh0RnJhbWUgPSBtX3NhbXBsZUJ1ZmZlckRp c3BsYXlMYXllciA/IHZpZGVvUmVjdCA6IENHUmVjdE1ha2UoMCwgMCwgdmlkZW9GdWxsc2NyZWVu RnJhbWUud2lkdGgoKSwgdmlkZW9GdWxsc2NyZWVuRnJhbWUuaGVpZ2h0KCkpOworICAgIFttX3Rl eHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIgc2V0RnJhbWU6dGV4dEZyYW1lXTsKKyNlbmRpZgor fQorICAgIAordm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnNldFRl eHRUcmFja1JlcHJlc2VudGF0aW9uKFRleHRUcmFja1JlcHJlc2VudGF0aW9uKiByZXByZXNlbnRh dGlvbikKK3sKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMpICYmIEVOQUJMRShW SURFT19QUkVTRU5UQVRJT05fTU9ERSkpCisgICAgUGxhdGZvcm1MYXllciogcmVwcmVzZW50YXRp b25MYXllciA9IHJlcHJlc2VudGF0aW9uID8gcmVwcmVzZW50YXRpb24tPnBsYXRmb3JtTGF5ZXIo KSA6IG5pbDsKKyAgICBpZiAocmVwcmVzZW50YXRpb25MYXllciA9PSBtX3RleHRUcmFja1JlcHJl c2VudGF0aW9uTGF5ZXIpIHsKKyAgICAgICAgc3luY1RleHRUcmFja0JvdW5kcygpOworICAgICAg ICByZXR1cm47CisgICAgfQorICAgIAorICAgIGlmIChtX3RleHRUcmFja1JlcHJlc2VudGF0aW9u TGF5ZXIpCisgICAgICAgIFttX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIgcmVtb3ZlRnJv bVN1cGVybGF5ZXJdOworICAgIAorICAgIG1fdGV4dFRyYWNrUmVwcmVzZW50YXRpb25MYXllciA9 IHJlcHJlc2VudGF0aW9uTGF5ZXI7CisgICAgCisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTGF5 ZXJNYW5hZ2VyLT52aWRlb0Z1bGxzY3JlZW5MYXllcigpICYmIG1fdGV4dFRyYWNrUmVwcmVzZW50 YXRpb25MYXllcikgeworICAgICAgICBzeW5jVGV4dFRyYWNrQm91bmRzKCk7CisgICAgICAgIFtt X3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2NyZWVuTGF5ZXIoKSBhZGRT dWJsYXllcjptX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIuZ2V0KCldOworICAgIH0KKyAg ICAKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHJlcHJlc2VudGF0aW9uKTsKKyNlbmRpZgorfQor ICAgIAogCiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRXaXJlbGVzc1BsYXliYWNrVGFyZ2V0 KFJlZjxNZWRpYVBsYXliYWNrVGFyZ2V0PiYmIHRhcmdldCkK