60826 2011-05-13 19:51:38 -0700 Video is blank, controller is misplaced on trailers.apple.com movie in fullscreen (with two screens) 2011-06-03 14:06:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble ademar oldest_to_newest 404014 0 jer.noble 2011-05-13 19:51:38 -0700 Video is blank, controller is misplaced on trailers.apple.com movie in fullscreen (with two screens) 404015 1 93544 jer.noble 2011-05-13 19:54:28 -0700 Created attachment 93544 Patch 404017 2 93544 simon.fraser 2011-05-13 20:09:09 -0700 Comment on attachment 93544 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93544&action=review > Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:1238 > + PlatformLayer* layer = m_qtVideoLayer.get(); > + do { > + if (rootLayer != layer) > + continue; > + > + // We own a child layer of a layer which has switched contexts. > + // Tear down our layer, and set m_visible to false, so that the > + // next time setVisible(true) is called, the layer will be re- > + // created in the correct context. > + tearDownVideoRendering(); > + m_visible = false; > + break; > + } while((layer = [layer superlayer])); This code is confusing. I think you want to have a loop that walks up the tree, and to pull the tearDownVideoRendering() code out of the loop. > Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:145 > + [[NSNotificationCenter defaultCenter] postNotificationName:@"CAContextChanged" object:nil userInfo:[NSDictionary dictionaryWithObject:m_fullScreenRootLayer.get() forKey:@"RootLayer"]]; > + m_fullScreenRootLayer = 0; You should add a comment to say who listens for this notification. I also think you should use a more unique name than "CAContextChanged", since it would be easy to imagine CA adding a notification with the same name in future. 404594 3 jer.noble 2011-05-16 10:51:07 -0700 Committed r86588: <http://trac.webkit.org/changeset/86588> 415180 4 ademar 2011-06-03 14:06:58 -0700 Revision r86588 cherry-picked into qtwebkit-2.2 with commit 9f2e6b1 <http://gitorious.org/webkit/qtwebkit/commit/9f2e6b1> 93544 2011-05-13 19:54:28 -0700 2011-05-13 20:09:09 -0700 Patch bug-60826-20110513195426.patch text/plain 12916 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODYyNjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyZWE3MGFkYTFhYmRhNWVh OWU2MDc2MzA4NDRiNmY1NzRmOTM4NGVlLi5jNzI3YTY2ZmUyMzgxZmYxN2IxYjExYTBjYjcwZTY2 YjljMDVjZmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDUtMTMgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVmlkZW8gaXMgYmxhbmssIGNvbnRyb2xsZXIgaXMgbWlzcGxh Y2VkIG9uIHRyYWlsZXJzLmFwcGxlLmNvbSBtb3ZpZSBpbiBmdWxsc2NyZWVuICh3aXRoIHR3byBz Y3JlZW5zKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjA4MjYKKworICAgICAgICBMaXN0ZW4gZm9yIGEgQ0FDb250ZXh0Q2hhbmdlZCBub3RpZmljYXRp b24gYW5kLCBpZiB0aGUgYWZmZWN0ZWQgbGF5ZXIgaXMgYW4KKyAgICAgICAgYW5jZXN0b3IgbGF5 ZXIgb2YgdGhlIHF0TW92aWVMYXllciwgdGVhciBkb3duIHRoZSBsYXllciBhbmQgcmVjcmVhdGUg aXQgdGhlCisgICAgICAgIG5leHQgdGltZSBzZXRWaXNpYmxlKHRydWUpIGlzIGNhbGxlZC4KKwor ICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6 d2Via2l0RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6ICBDYWxsIHNldEZ1bGxTY3JlZW5S b290TGF5ZXIoMCkgCisgICAgICAgICAgICBiZWZvcmUgZGlzYWJsaW5nIGFuaW1hdGlvbiBvbiB0 aGUgZnVsbCBzY3JlZW4gcmVuZGVyZXIuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFj L01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlUVRLaXQ6OmNyZWF0ZVFUTW92aWUpOiBSZWdpc3RlciBhbiBvYnNlcnZlciBm b3IgdGhlIG5ldyAKKyAgICAgICAgICAgIENBQ29udGV4dENoYW5nZWQgbm90aWZpY2F0aW9uLgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNvbnRleHRDaGFuZ2Vk KTogQWRkZWQuICBJZiB0aGUgY2hhbmdlZAorICAgICAgICAgICAgbGF5ZXIgaXMgYW4gYW5jZXN0 b3Igb2YgdGhlIG1vdmllIGxheWVyLCB0ZWFyIGRvd24gcmVuZGVyaW5nIGFuZCByZS0KKyAgICAg ICAgICAgIGNyZWF0ZSB0aGUgbmV4dCB0aW1lIHNldFZpc2libGUodHJ1ZSkgaXMgY2FsbGVkLgor ICAgICAgICAoLVtXZWJDb3JlTW92aWVPYnNlcnZlciBDQUNvbnRleHRDaGFuZ2VkOl0pOiAgQWRk ZWQgT2JqQyBsaXN0ZW5lciB3cmFwcGVyLgorCiAyMDExLTA1LTExICBOb2FtIFJvc2VudGhhbCAg PG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRo IFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDJkYWRhNjY3 MjNhMzkzNmZjYzcwODRlMTcyZjUzOGEyNzA5OTJmZDUuLjE4MmQwZWYzNTQ0MjA1NzlkZTZmMmI5 ZmMwMTk2MmY5NzQ1ZGNkYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDg4OSwxMCAr NDg4OSwxMiBAQCB2b2lkIERvY3VtZW50Ojp3ZWJraXRXaWxsRW50ZXJGdWxsU2NyZWVuRm9yRWxl bWVudChFbGVtZW50KiBlbGVtZW50KQogdm9pZCBEb2N1bWVudDo6d2Via2l0RGlkRW50ZXJGdWxs U2NyZWVuRm9yRWxlbWVudChFbGVtZW50KikKIHsKICAgICBpZiAobV9mdWxsU2NyZWVuUmVuZGVy ZXIpIHsKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgICAgIHBhZ2UoKS0+ Y2hyb21lKCktPmNsaWVudCgpLT5zZXRSb290RnVsbFNjcmVlbkxheWVyKDApOworI2VuZGlmCiAg ICAgICAgIG1fZnVsbFNjcmVlblJlbmRlcmVyLT5zZXRBbmltYXRpbmcoZmFsc2UpOwogI2lmIFVT RShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAgdmlldygpLT51cGRhdGVDb21wb3Np dGluZ0xheWVycygpOwotICAgICAgICBwYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+c2V0Um9v dEZ1bGxTY3JlZW5MYXllcigwKTsKICNlbmRpZgogICAgIH0KICAgICBtX2Z1bGxTY3JlZW5DaGFu Z2VEZWxheVRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgK aW5kZXggYjdiYjg2YjY0MDE1YWJlYjQ1NGFkNTI1NDZiYmQwNGZkOTAwYjlmOC4uOTBhYzdhYWM2 MjA1Y2UzODJhYzA0MGI1ODY5MzRjNWUyZjU1M2ZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFU S2l0LmgKQEAgLTY3LDYgKzY3LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2l6ZUNoYW5nZWQoKTsK ICAgICB2b2lkIHRpbWVDaGFuZ2VkKCk7CiAgICAgdm9pZCBkaWRFbmQoKTsKKyNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgdm9pZCBjb250ZXh0Q2hhbmdlZChQbGF0Zm9ybUxh eWVyKiByb290TGF5ZXIpOworI2VuZGlmCiAKIHByaXZhdGU6CiAgICAgTWVkaWFQbGF5ZXJQcml2 YXRlUVRLaXQoTWVkaWFQbGF5ZXIqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQppbmRl eCA1ZDZjYjI1ZmY2ZGU3NDdlNGM1NDhiNTA0ZjgyZWZhMGEyZjQzMjdjLi5jMTliN2RjMTY2MTNh NjBlZmIxY2IzOTVjMGRiZjgxMzE2ZTY5NmE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0 Lm1tCkBAIC0xNzIsNiArMTcyLDcgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIC0odm9pZClzaXpl Q2hhbmdlZDooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb247CiAtKHZvaWQpdGltZUNoYW5n ZWQ6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uOwogLSh2b2lkKWRpZEVuZDooTlNOb3Rp ZmljYXRpb24gKilub3RpZmljYXRpb247CistKHZvaWQpQ0FDb250ZXh0Q2hhbmdlZDooTlNOb3Rp ZmljYXRpb24gKilub3RpZmljYXRpb247CiBAZW5kCiAKIEBwcm90b2NvbCBXZWJLaXRWaWRlb1Jl bmRlcmluZ0RldGFpbHMKQEAgLTQwNyw2ICs0MDgsMTIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVRVEtpdDo6Y3JlYXRlUVRNb3ZpZShOU1VSTCAqdXJsLCBOU0RpY3Rpb25hcnkgKm1vdmllQXR0 cmkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdG9y OkBzZWxlY3RvcihkaWRFbmQ6KSAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBuYW1lOlFUTW92aWVEaWRFbmROb3RpZmljYXRpb24gCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdDptX3F0TW92aWUuZ2V0 KCldOworI2lmIGRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorICAgIFtbTlNOb3Rp ZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6bV9vYmpjT2JzZXJ2ZXIu Z2V0KCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVj dG9yOkBzZWxlY3RvcihDQUNvbnRleHRDaGFuZ2VkOikKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBuYW1lOkAiQ0FDb250ZXh0Q2hhbmdlZCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0Om5pbF07Cisj ZW5kaWYKIH0KIAogc3RhdGljIHZvaWQgbWFpblRocmVhZFNldE5lZWRzRGlzcGxheShpZCBzZWxm LCBTRUwpCkBAIC0xMjA5LDYgKzEyMTYsMzIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVRVEtp dDo6ZGlkRW5kKCkKICAgICBtX3BsYXllci0+dGltZUNoYW5nZWQoKTsKIH0KIAorI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNv bnRleHRDaGFuZ2VkKFBsYXRmb3JtTGF5ZXIqIHJvb3RMYXllcikKK3sKKyNpZiBkZWZpbmVkKEJV SUxESU5HX09OX1NOT1dfTEVPUEFSRCkKKyAgICBpZiAoIXJvb3RMYXllcikKKyAgICAgICAgcmV0 dXJuOworICAgIAorICAgIFBsYXRmb3JtTGF5ZXIqIGxheWVyID0gbV9xdFZpZGVvTGF5ZXIuZ2V0 KCk7CisgICAgZG8geworICAgICAgICBpZiAocm9vdExheWVyICE9IGxheWVyKQorICAgICAgICAg ICAgY29udGludWU7CisKKyAgICAgICAgLy8gV2Ugb3duIGEgY2hpbGQgbGF5ZXIgb2YgYSBsYXll ciB3aGljaCBoYXMgc3dpdGNoZWQgY29udGV4dHMuICAKKyAgICAgICAgLy8gVGVhciBkb3duIG91 ciBsYXllciwgYW5kIHNldCBtX3Zpc2libGUgdG8gZmFsc2UsIHNvIHRoYXQgdGhlIAorICAgICAg ICAvLyBuZXh0IHRpbWUgc2V0VmlzaWJsZSh0cnVlKSBpcyBjYWxsZWQsIHRoZSBsYXllciB3aWxs IGJlIHJlLQorICAgICAgICAvLyBjcmVhdGVkIGluIHRoZSBjb3JyZWN0IGNvbnRleHQuCisgICAg ICAgIHRlYXJEb3duVmlkZW9SZW5kZXJpbmcoKTsKKyAgICAgICAgbV92aXNpYmxlID0gZmFsc2U7 CisgICAgICAgIGJyZWFrOworICAgIH0gd2hpbGUoKGxheWVyID0gW2xheWVyIHN1cGVybGF5ZXJd KSk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShyb290TGF5ZXIpOworI2VuZGlmCit9CisjZW5k aWYKKwogdm9pZCBNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6c2V0U2l6ZShjb25zdCBJbnRTaXpl JikgCiB7IAogICAgIC8vIERvbid0IHJlc2l6ZSB0aGUgdmlldyBub3cgYmVjYXVzZSBbdmlldyBz ZXRGcmFtZV0gYWxzbyByZXNpemVzIHRoZSBtb3ZpZSBpdHNlbGYsIGFuZCBiZWNhdXNlCkBAIC0x NzAzLDYgKzE3MzYsMTYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6c2V0UHJpdmF0 ZUJyb3dzaW5nTW9kZShib29sIHByaXZhdGVCcm93c2luZykKICAgICBbc2VsZiByZXBhaW50XTsK IH0KIAorLSAodm9pZClDQUNvbnRleHRDaGFuZ2VkOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNh dGlvbgoreworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBDQUxheWVyKiBy b290TGF5ZXIgPSBbW25vdGlmaWNhdGlvbiB1c2VySW5mb10gb2JqZWN0Rm9yS2V5OkAiUm9vdExh eWVyIl07CisgICAgbV9jYWxsYmFjay0+Y29udGV4dENoYW5nZWQocm9vdExheWVyKTsKKyNlbHNl CisgICAgVU5VU0VEX1BBUkFNKG5vdGlmaWNhdGlvbik7CisjZW5kaWYKK30KKwogLSAodm9pZClz ZXREZWxheUNhbGxiYWNrczooQk9PTClzaG91bGREZWxheQogewogICAgIG1fZGVsYXlDYWxsYmFj a3MgPSBzaG91bGREZWxheTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAyMTM4NTc1NDkzNGYwYzZlNTI0MDlmZTM4 MjUwZmYxN2JhNGYzNGNkLi5jMzE2ZDFjZTgwZDA2ZjU0YjRhOTdiNmI4ODAwMWQ4OTc0MmZlODI1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzIgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KIAorICAgICAgICBWaWRlbyBpcyBibGFuaywgY29udHJvbGxlciBpcyBtaXNw bGFjZWQgb24gdHJhaWxlcnMuYXBwbGUuY29tIG1vdmllIGluIGZ1bGxzY3JlZW4gKHdpdGggdHdv IHNjcmVlbnMpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MDgyNgorCisgICAgICAgIEVtaXQgYSBub3RpZmljYXRpb24gd2hlbiBtb3ZpbmcgYSBDQUxh eWVyIGZyb20gdGhlIFdlYlByb2Nlc3MncyBtYWluCisgICAgICAgIGxheWVyIGhvc3QgdG8gYSBu ZXcgY29udGV4dC4gIFRoaXMgYWxsb3dzIGxpc3RlbmVycyB0byBpbnZhbGlkYXRlIHRoZWlyCisg ICAgICAgIGxheWVycyB3aGljaCBtYXkgbm90IHN1cHBvcnQgbW92aW5nIGJldHdlZW4gZGlmZmVy ZW50IENBQ29udGV4dHMgKGFzIGlzCisgICAgICAgIHRoZSBjYXNlIHdpdGggUVRNb3ZpZUxheWVy KS4gIEluIG9yZGVyIHRvIGFsbG93IGxpc3RlbmVycyB0byBkZXRlcm1pbmUgaWYgdGhleQorICAg ICAgICBhcmUgYWZmZWN0ZWQsIHRoZSBub3RpZmljYXRpb24gd2lsbCBwYXNzIHRoZSByb290IENB TGF5ZXIgaW4gYSB1c2VySW5mbworICAgICAgICBkaWN0aW9uYXJ5LgorCisgICAgICAgIEluIFdl YkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLCBtb3ZlIGZyb20gc3RvcmluZyBhIHBvaW50ZXIgdG8gYSBu b24tcmVmY291bnRlZAorICAgICAgICBjbGFzcyAoR3JhcGhpY3NMYXllcikgdG8gYSByZXRhaW5h YmxlIGNsYXNzIChQbGF0Zm9ybUxheWVyKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvRnVsbFNj cmVlbi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNz L0Z1bGxTY3JlZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLm1tOgorICAgICAgICAoV2Vi S2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6V2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMpOiBO byBuZWVkIHRvIGluaXRpYWxpemUKKyAgICAgICAgICAgIG1fZnVsbFNjcmVlblJvb3RMYXllciBu b3cgdGhhdCBpdCBpcyBhIFJldGFpblB0cjw+LgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2Ny ZWVuTWFuYWdlck1hYzo6c2V0Um9vdEZ1bGxTY3JlZW5MYXllcik6IEVtaXQgYSBub3RpZmljYXRp b24KKyAgICAgICAgICAgIGFmdGVyIGVpdGhlciBjcmVhdGluZyBvciBkZXN0cm95aW5nIHRoZSBm dWxsIHNjcmVlbiBsYXllciBob3N0LgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFu YWdlck1hYzo6YmVnaW5FbnRlckZ1bGxTY3JlZW5BbmltYXRpb24pOgorICAgICAgICAoV2ViS2l0 OjpXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6YmVnaW5FeGl0RnVsbFNjcmVlbkFuaW1hdGlvbik6 CisKKzIwMTEtMDUtMTMgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgRmxhc2hpbmcgd2luZG93 IGZyYW1lIGFuZCBncmFwaGljYWwgZ2xpdGNoZXMgYWZ0ZXIgZXhpdGluZyBmdWxsIHNjcmVlbiBt b2RlLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA4 MjUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL21h Yy9XZWJGdWxsU2NyZWVuTWFuYWdlck1hYy5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9G dWxsU2NyZWVuL21hYy9XZWJGdWxsU2NyZWVuTWFuYWdlck1hYy5oCmluZGV4IGUyNDdlYjVmZTkz MmI4OWY1YmU1MDU0ZDkxYTA1NjJhODA5MjVjMzcuLjgwNWIxMjk2ODNmMTI5YmZjNzAwNDJjNjVj MDYzMTRiYmVlZmIxNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRnVs bFNjcmVlbi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLmgKQEAg LTMxLDYgKzMxLDcgQEAKICNpbXBvcnQgIkxheWVyVHJlZUNvbnRleHQuaCIKICNpbXBvcnQgIldl YkZ1bGxTY3JlZW5NYW5hZ2VyLmgiCiAKKyNpbXBvcnQgPFdlYkNvcmUvR3JhcGhpY3NMYXllci5o PgogI2ltcG9ydCA8V2ViQ29yZS9JbnRSZWN0Lmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+ CiAKQEAgLTUzLDcgKzU0LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgYmVnaW5FeGl0 RnVsbFNjcmVlbkFuaW1hdGlvbihmbG9hdCBkdXJhdGlvbik7CiAKICAgICBPd25QdHI8V2ViQ29y ZTo6R3JhcGhpY3NMYXllcj4gbV9yb290TGF5ZXI7Ci0gICAgV2ViQ29yZTo6R3JhcGhpY3NMYXll ciogbV9mdWxsU2NyZWVuUm9vdExheWVyOworICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBt X2Z1bGxTY3JlZW5Sb290TGF5ZXI7CiAgICAgTGF5ZXJUcmVlQ29udGV4dCBtX2xheWVyVHJlZUNv bnRleHQ7CiAgICAgUmV0YWluUHRyPFdLQ0FSZW1vdGVMYXllckNsaWVudFJlZj4gbV9yZW1vdGVM YXllckNsaWVudDsKICAgICBSZXRhaW5QdHI8aWQ+IG1fZW50ZXJGdWxsU2NyZWVuTGlzdGVuZXI7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vbWFjL1dl YkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxs U2NyZWVuL21hYy9XZWJGdWxsU2NyZWVuTWFuYWdlck1hYy5tbQppbmRleCA2MmEwZmZlMDgxZTJl MDgwNDBhYjJmODUwMjhmM2MyYzNlMzk4ZGZlLi5mNmNiMmUxNjE1ZDVkNzM3MWJlZjY3NjY3MGFl ODAzNTNkZGYxZTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxT Y3JlZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvRnVsbFNjcmVlbi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMubW0KQEAg LTExNyw3ICsxMTcsNiBAQCBQYXNzUmVmUHRyPFdlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjPiBXZWJG dWxsU2NyZWVuTWFuYWdlck1hYzo6Y3JlYXRlKFdlYlBhZ2UqIHBhZwogCiBXZWJGdWxsU2NyZWVu TWFuYWdlck1hYzo6V2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMoV2ViUGFnZSogcGFnZSkKICAgICA6 IFdlYkZ1bGxTY3JlZW5NYW5hZ2VyKHBhZ2UpCi0gICAgLCBtX2Z1bGxTY3JlZW5Sb290TGF5ZXIo MCkKIHsKICAgICBtX2VudGVyRnVsbFNjcmVlbkxpc3RlbmVyLmFkb3B0TlMoW1tXZWJGdWxsU2Ny ZWVuTWFuYWdlckFuaW1hdGlvbkxpc3RlbmVyIGFsbG9jXSBpbml0V2l0aE1hbmFnZXI6dGhpcyBi ZWdhbjomV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OmJlZ2FuRW50ZXJGdWxsU2NyZWVuQW5pbWF0 aW9uIGZpbmlzaGVkOiZXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6ZmluaXNoZWRFbnRlckZ1bGxT Y3JlZW5BbmltYXRpb25dKTsKICAgICBtX2V4aXRGdWxsU2NyZWVuTGlzdGVuZXIuYWRvcHROUyhb W1dlYkZ1bGxTY3JlZW5NYW5hZ2VyQW5pbWF0aW9uTGlzdGVuZXIgYWxsb2NdIGluaXRXaXRoTWFu YWdlcjp0aGlzIGJlZ2FuOiZXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6YmVnYW5FeGl0RnVsbFNj cmVlbkFuaW1hdGlvbiBmaW5pc2hlZDomV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OmZpbmlzaGVk RXhpdEZ1bGxTY3JlZW5BbmltYXRpb25dKTsKQEAgLTEzMiwxOSArMTMxLDIxIEBAIFdlYkZ1bGxT Y3JlZW5NYW5hZ2VyTWFjOjp+V2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMoKQogCiB2b2lkIFdlYkZ1 bGxTY3JlZW5NYW5hZ2VyTWFjOjpzZXRSb290RnVsbFNjcmVlbkxheWVyKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXIqIGxheWVyKQogewotICAgIGlmIChtX2Z1bGxTY3JlZW5Sb290TGF5ZXIgPT0gbGF5 ZXIpCisgICAgaWYgKG1fZnVsbFNjcmVlblJvb3RMYXllciA9PSAobGF5ZXIgPyBsYXllci0+cGxh dGZvcm1MYXllcigpIDogMCkpCiAgICAgICAgIHJldHVybjsKLSAgICBtX2Z1bGxTY3JlZW5Sb290 TGF5ZXIgPSBsYXllcjsKIAotICAgIGlmICghbV9mdWxsU2NyZWVuUm9vdExheWVyKSB7CisgICAg aWYgKCFsYXllcikgewogICAgICAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYkZ1bGxTY3Jl ZW5NYW5hZ2VyUHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKTsKICAgICAg ICAgaWYgKG1fcm9vdExheWVyKSB7CiAgICAgICAgICAgICBtX3Jvb3RMYXllci0+cmVtb3ZlQWxs Q2hpbGRyZW4oKTsKICAgICAgICAgICAgIG1fcm9vdExheWVyID0gbnVsbHB0cjsKICAgICAgICAg fQorICAgICAgICAKKyAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVy XSBwb3N0Tm90aWZpY2F0aW9uTmFtZTpAIkNBQ29udGV4dENoYW5nZWQiIG9iamVjdDpuaWwgdXNl ckluZm86W05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVjdDptX2Z1bGxTY3JlZW5Sb290 TGF5ZXIuZ2V0KCkgZm9yS2V5OkAiUm9vdExheWVyIl1dOworICAgICAgICBtX2Z1bGxTY3JlZW5S b290TGF5ZXIgPSAwOwogICAgICAgICByZXR1cm47CiAgICAgfQotCisgICAgCiAgICAgaWYgKCFt X3Jvb3RMYXllcikgewogICAgICAgICBtYWNoX3BvcnRfdCBzZXJ2ZXJQb3J0ID0gV2ViUHJvY2Vz czo6c2hhcmVkKCkuY29tcG9zaXRpbmdSZW5kZXJTZXJ2ZXJQb3J0KCk7CiAgICAgICAgIG1fcmVt b3RlTGF5ZXJDbGllbnQgPSBXS0NBUmVtb3RlTGF5ZXJDbGllbnRNYWtlV2l0aFNlcnZlclBvcnQo c2VydmVyUG9ydCk7CkBAIC0xNjMsMTIgKzE2NCwxNCBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5h Z2VyTWFjOjpzZXRSb290RnVsbFNjcmVlbkxheWVyKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIGxh eQogICAgIH0KIAogICAgIG1fcm9vdExheWVyLT5yZW1vdmVBbGxDaGlsZHJlbigpOwotCi0gICAg aWYgKG1fZnVsbFNjcmVlblJvb3RMYXllcikKLSAgICAgICAgbV9yb290TGF5ZXItPmFkZENoaWxk KG1fZnVsbFNjcmVlblJvb3RMYXllcik7CisgICAgbV9yb290TGF5ZXItPmFkZENoaWxkKGxheWVy KTsKIAogICAgIG1fcm9vdExheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9u bHkoKTsKICAgICBtX3BhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCktPnN5bmND b21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CisgICAgbV9mdWxsU2NyZWVuUm9v dExheWVyID0gbGF5ZXItPnBsYXRmb3JtTGF5ZXIoKTsKKyAgICBsYXllci0+c3luY0NvbXBvc2l0 aW5nU3RhdGUoKTsKKworICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0g cG9zdE5vdGlmaWNhdGlvbk5hbWU6QCJDQUNvbnRleHRDaGFuZ2VkIiBvYmplY3Q6bmlsIHVzZXJJ bmZvOltOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6bV9mdWxsU2NyZWVuUm9vdExh eWVyLmdldCgpIGZvcktleTpAIlJvb3RMYXllciJdXTsKIH0KIAogdm9pZCBXZWJGdWxsU2NyZWVu TWFuYWdlck1hYzo6YmVnaW5FbnRlckZ1bGxTY3JlZW5BbmltYXRpb24oZmxvYXQgZHVyYXRpb24p CkBAIC0xOTAsNyArMTkzLDcgQEAgdm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6YmVnaW5F bnRlckZ1bGxTY3JlZW5BbmltYXRpb24oZmxvYXQgZHVyYXRpb24pCiAgICAgLy8gRklYTUU6IE9u Y2Ugd2UgZ2FpbiB0aGUgYWJpbGl0eSB0byBkbyBuYXRpdmUgV2ViS2l0IGFuaW1hdGlvbnMgb2Yg Z2VuZXJhdGVkCiAgICAgLy8gY29udGVudCwgdGhpcyBjYW4gY2hhbmdlIHRvIHVzZSB0aGVtLiAg TWVhbndoaWxlLCB3ZSdsbCBoYXZlIHRvIGFuaW1hdGUgdGhlCiAgICAgLy8gQ0FMYXllciBkaXJl Y3RseToKLSAgICBDQUxheWVyKiBjYUxheWVyID0gbV9mdWxsU2NyZWVuUm9vdExheWVyLT5wbGF0 Zm9ybUxheWVyKCk7CisgICAgQ0FMYXllciogY2FMYXllciA9IG1fZnVsbFNjcmVlblJvb3RMYXll ci5nZXQoKTsKIAogICAgIC8vIENyZWF0ZSBhIHRyYW5zZm9ybWF0aW9uIG1hdHJpeCB0aGF0IHdp bGwgdHJhbnNmb3JtIHRoZSByZW5kZXJlciBsYXllciBzdWNoIHRoYXQKICAgICAvLyB0aGUgZnVs bHNjcmVlbiBlbGVtZW50IGFwcGVhcnMgdG8gbW92ZSBmcm9tIGl0cyBzdGFydGluZyBwb3NpdGlv biBhbmQgc2l6ZSB0byBpdHMKQEAgLTI0NSw3ICsyNDgsNyBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5N YW5hZ2VyTWFjOjpiZWdpbkV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uKGZsb2F0IGR1cmF0aW9uKQog ICAgIC8vIEZJWE1FOiBPbmNlIHdlIGdhaW4gdGhlIGFiaWxpdHkgdG8gZG8gbmF0aXZlIFdlYktp dCBhbmltYXRpb25zIG9mIGdlbmVyYXRlZAogICAgIC8vIGNvbnRlbnQsIHRoaXMgY2FuIGNoYW5n ZSB0byB1c2UgdGhlbS4gIE1lYW53aGlsZSwgd2UnbGwgaGF2ZSB0byBhbmltYXRlIHRoZQogICAg IC8vIENBTGF5ZXIgZGlyZWN0bHk6Ci0gICAgQ0FMYXllciogY2FMYXllciA9IG1fZnVsbFNjcmVl blJvb3RMYXllci0+cGxhdGZvcm1MYXllcigpOworICAgIENBTGF5ZXIqIGNhTGF5ZXIgPSBtX2Z1 bGxTY3JlZW5Sb290TGF5ZXIuZ2V0KCk7CiAKICAgICAvLyBDcmVhdGUgYSB0cmFuc2Zvcm1hdGlv biBtYXRyaXggdGhhdCB3aWxsIHRyYW5zZm9ybSB0aGUgcmVuZGVyZXIgbGF5ZXIgc3VjaCB0aGF0 CiAgICAgLy8gdGhlIGZ1bGxzY3JlZW4gZWxlbWVudCBhcHBlYXJzIHRvIG1vdmUgZnJvbSBpdHMg c3RhcnRpbmcgcG9zaXRpb24gYW5kIHNpemUgdG8gaXRzCg==