62507 2011-06-11 23:51:56 -0700 REGRESSION (full screen video): Watch Again button is obscured after full screen playback ends at Apple trailers page 2011-06-12 23:21:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble webkit.review.bot oldest_to_newest 419271 0 jer.noble 2011-06-11 23:51:56 -0700 REGRESSION (full screen video): Watch Again button is obscured after full screen playback ends at Apple trailers page 419276 1 96872 jer.noble 2011-06-12 01:25:20 -0700 Created attachment 96872 Patch 419277 2 webkit.review.bot 2011-06-12 01:27:38 -0700 Attachment 96872 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/dom/Document.h:1063: The parameter name "method" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 419319 3 jer.noble 2011-06-12 12:21:03 -0700 <rdar://problem/9594595> 419323 4 96887 jer.noble 2011-06-12 12:30:07 -0700 Created attachment 96887 Patch Fixed style errors. 419409 5 96887 darin 2011-06-12 20:43:29 -0700 Comment on attachment 96887 Patch My original complaint was driven by the fact that I did not understand this function was called in a loop up the entire parent chain. I thought it was called once, and was puzzled about it. Now that I understand it, here are my two complaints about the existing function: - It doesn’t seem good to have a function that operates on all ancestors incorporate the word “recursively”. There’s no recursion here, just a simple loop that goes up all ancestors. In the context of nodes, “recursively” almost always means that all descendants are involved, since recursion is a common way to walk all the descendants. - There is no need to have this function be a member of the class Document. This could be a free function, private to Document.cpp and not in the header at all. - The operation of walking one step up the parent chain and crossing frame boundaries into owner elements would be clearer as a named function rather than a ? : expression. I suggest naming this function setContainsFullScreenElementIncludingAncestorsCrossingFrameBoundaries, or a shorter similar name. I suggest we make a function called something like parentCrossingFrameBoundaries. This can be a free function, private to Document.cpp, or could even be an Element member function. Once we have that, then we can easily just call it like this: setContainsFullScreenElementIncludingAncestorsCrossingFrameBoundaries(parentCrossingFrameBoundaries(m_fullScreenElement.get()), false); Or if you really want to avoid this, you can just put that single in into a named function and use it like this: setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(m_fullScreenElement.get(), false); I know those are long function names, but I think they are sufficiently clear, and this would all be private to Document.cpp. r=me but *please* don't use the enum as you do here Also, I suggest doing the refactoring in a separate patch that does not change behavior, and land the bug fix on its own. I assume the bug fix is adding the new code to Document::fullScreenElementRemoved. 419427 6 jer.noble 2011-06-12 22:16:34 -0700 Just a quick reply to a subset of your comments: (In reply to comment #5) > (From update of attachment 96887 [details]) > - There is no need to have this function be a member of the class Document. This could be a free function, private to Document.cpp and not in the header at all. Actually, the only reason it's in the Document.h header is because it's also used in Element.cpp as well. The reason I made the enum parameter have a default was so as not to affect those call sites. As for the rest, I'll make the simple fix here, and file & fix the rest of your comments in a new bug. > r=me but *please* don't use the enum as you do here Sure thing. Thanks! 419431 7 jer.noble 2011-06-12 22:23:35 -0700 Filed bug #62528 to cover the refactoring of Document::setContainsFullScreenElementRecursively. 419433 8 jer.noble 2011-06-12 22:27:26 -0700 Also filed bug #62529 to track fixing the DRT to catch the regression causing this bug. 419445 9 jer.noble 2011-06-12 23:21:01 -0700 Committed r88629: <http://trac.webkit.org/changeset/88629> 96872 2011-06-12 01:25:20 -0700 2011-06-12 12:30:02 -0700 Patch bug-62507-20110612012519.patch text/plain 5037 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODg1OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjOGU4ZjA3ZjM4YTUwYmM1 MWVjZjYyMWI4YmMxN2RmMzdjNzk5NzMwLi5lMTZkOTRkODQxMzhkNWJhYmM3OTQxYjlmNTgwZmE0 N2Q4MGNjNzExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzEgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSRUdSRVNTSU9OIChmdWxsIHNjcmVlbiB2 aWRlbyk6IFdhdGNoIEFnYWluIGJ1dHRvbiBpcyBvYnNjdXJlZCBhZnRlciBmdWxsIHNjcmVlbiBw bGF5YmFjayBlbmRzIGF0IEFwcGxlIHRyYWlsZXJzIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyNTA3CisKKyAgICAgICAgTm8gbmV3IHRlc3Rz OyBEUlQgd291bGQgaGF2ZSB0byBiZSBtb2RpZmllZCB0byBkZWxheSBiZXR3ZWVuIHJlY2Vpdmlu ZyBleGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoKSBhbmQgY2FsbGluZyAKKyAgICAgICAgd2Via2l0 V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCgpIHRvIGJlIGFibGUgdG8gdGVzdCB0aGlzLgor CisgICAgICAgIElmIHRoZSBmdWxsLXNjcmVlbiBlbGVtZW50IGlzIHJlbW92ZWQsIGFuZCB3ZWJr aXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KCkgaXMgbm90IGNhbGxlZCBiZWZvcmUKKyAg ICAgICAgZnVsbFNjcmVlbkVsZW1lbnRSZW1vdmVkKCkgcmV0dXJucywgdGhlbiBhbmNlc3RvcnMg b2YgdGhlIGZ1bGwtc2NyZWVuIGVsZW1lbnQgd2lsbCBub3QgaGF2ZSB0aGVpcgorICAgICAgICBj b250YWluc0Z1bGxTY3JlZW5FbGVtZW50IHByb3BlcnR5IHJlbW92ZWQuICBUbyBwcm90ZWN0IGFn YWluc3QgdGhpcywgcmVzZXQgdGhlIHByb3BlcnR5IGJ5IGNhbGxpbmcgCisgICAgICAgIHNldENv bnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNpdmVseSgpIGZyb20gd2l0aGluIGZ1bGxTY3Jl ZW5FbGVtZW50UmVtb3ZlZCgpLgorCisgICAgICAgIFRvIG1ha2UgdGhlIGNhbGxpbmcgY29udmVu dGlvbiBzYW5lciwgYWRkIGFub3RoZXIgcGFyYW1ldGVyIHRvIHNldENvbnRhaW5zRnVsbFNjcmVl bkVsZW1lbnRSZWN1cnNpdmVseSwKKyAgICAgICAgdG8gYWxsb3cgaXQgdG8gYWN0IG9uIHRoZSBw YXNzZWQgaW4gZWxlbWVudCdzIHBhcmVudCByYXRoZXIgdGhhbiB0aGUgZWxlbWVudCBpdHNlbGYu CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1l bnRSZWN1cnNpdmVseSk6IEFjdCBvbiB0aGUgZWxlbWVudCdzIHBhcmVudC4KKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50Ojp3ZWJraXRXaWxsRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6IE1v ZGlmaWVkIGNhbGwgdG8gc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxlbWVudFJlY3Vyc2l2ZWx5Lgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OndlYmtpdFdpbGxFeGl0RnVsbFNjcmVlbkZvckVs ZW1lbnQpOiBNb2RpZmllZCBjYWxsIHRvIHNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1 cnNpdmVseS4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpmdWxsU2NyZWVuRWxlbWVudFJl bW92ZWQpOiBBZGRlZCBjYWxsIHRvIHNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNp dmVseS4KKworMjAxMS0wNi0xMSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBBdm9pZCBmbGFz aGluZyB3aGVuIGV4aXRpbmcgZnVsbC1zY3JlZW4gbW9kZS4KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMzM4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CmluZGV4IDdmZGNkZWYzMjY1NDZjNmE1YzU4YzdjZmZlMGRlMWZlNmE1MGIyN2MuLmI3Zjg4Y2Qy NDIyMTAxNGYwOGE3ZTVlZTQ3MDU1NTY2OTUwMTRjY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw cApAQCAtNDc0NCw4ICs0NzQ0LDEyIEBAIHZvaWQgRG9jdW1lbnQ6OndlYmtpdENhbmNlbEZ1bGxT Y3JlZW4oKQogICAgIHBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5leGl0RnVsbFNjcmVlbkZv ckVsZW1lbnQobV9mdWxsU2NyZWVuRWxlbWVudC5nZXQoKSk7CiB9CiAKLXZvaWQgRG9jdW1lbnQ6 OnNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNpdmVseShFbGVtZW50KiBlbGVtZW50 LCBib29sIGNvbnRhaW5zKQordm9pZCBEb2N1bWVudDo6c2V0Q29udGFpbnNGdWxsU2NyZWVuRWxl bWVudFJlY3Vyc2l2ZWx5KEVsZW1lbnQqIGVsZW1lbnQsIGJvb2wgY29udGFpbnMsIFJlY3Vyc2lv bk1ldGhvZCBtZXRob2QpCiB7CisgICAgQVNTRVJUKGVsZW1lbnQpOworICAgIGlmIChtZXRob2Qg PT0gU3RhcnRXaXRoUGFyZW50KQorICAgICAgICBlbGVtZW50ID0gZWxlbWVudC0+cGFyZW50RWxl bWVudCgpID8gZWxlbWVudC0+cGFyZW50RWxlbWVudCgpIDogZWxlbWVudC0+ZG9jdW1lbnQoKS0+ b3duZXJFbGVtZW50KCk7CisKICAgICB3aGlsZSAoZWxlbWVudCkgewogICAgICAgICBlbGVtZW50 LT5zZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50KGNvbnRhaW5zKTsKICAgICAgICAgZWxlbWVu dCA9IChlbGVtZW50LT5wYXJlbnRFbGVtZW50KCkgPyBlbGVtZW50LT5wYXJlbnRFbGVtZW50KCkg OiBlbGVtZW50LT5kb2N1bWVudCgpLT5vd25lckVsZW1lbnQoKSk7CkBAIC00NzczLDcgKzQ3Nzcs NyBAQCB2b2lkIERvY3VtZW50Ojp3ZWJraXRXaWxsRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChF bGVtZW50KiBlbGVtZW50KQogICAgIGlmIChtX2Z1bGxTY3JlZW5FbGVtZW50ICE9IGRvY3VtZW50 RWxlbWVudCgpKQogICAgICAgICBtX2Z1bGxTY3JlZW5FbGVtZW50LT5kZXRhY2goKTsKIAotICAg IHNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNpdmVseShtX2Z1bGxTY3JlZW5FbGVt ZW50LT5wYXJlbnRFbGVtZW50KCkgPyBtX2Z1bGxTY3JlZW5FbGVtZW50LT5wYXJlbnRFbGVtZW50 KCkgOiBvd25lckVsZW1lbnQoKSwgdHJ1ZSk7CisgICAgc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxl bWVudFJlY3Vyc2l2ZWx5KG1fZnVsbFNjcmVlbkVsZW1lbnQuZ2V0KCksIHRydWUsIFN0YXJ0V2l0 aFBhcmVudCk7CiAgICAgCiAgICAgcmVjYWxjU3R5bGUoRm9yY2UpOwogICAgIApAQCAtNDgwNCw3 ICs0ODA4LDcgQEAgdm9pZCBEb2N1bWVudDo6d2Via2l0RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxl bWVudChFbGVtZW50KikKIAogdm9pZCBEb2N1bWVudDo6d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVu Rm9yRWxlbWVudChFbGVtZW50KikKIHsKLSAgICBzZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50 UmVjdXJzaXZlbHkobV9mdWxsU2NyZWVuRWxlbWVudC0+cGFyZW50RWxlbWVudCgpID8gbV9mdWxs U2NyZWVuRWxlbWVudC0+cGFyZW50RWxlbWVudCgpIDogb3duZXJFbGVtZW50KCksIGZhbHNlKTsK KyAgICBzZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50UmVjdXJzaXZlbHkobV9mdWxsU2NyZWVu RWxlbWVudC5nZXQoKSwgZmFsc2UsIFN0YXJ0V2l0aFBhcmVudCk7CiAgICAgCiAgICAgbV9mdWxs U2NyZWVuRWxlbWVudC0+d2lsbFN0b3BCZWluZ0Z1bGxzY3JlZW5FbGVtZW50KCk7CiAKQEAgLTQ5 MTQsNiArNDkxOCw3IEBAIHZvaWQgRG9jdW1lbnQ6OmZ1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWVy RmlyZWQoVGltZXI8RG9jdW1lbnQ+KikKIAogdm9pZCBEb2N1bWVudDo6ZnVsbFNjcmVlbkVsZW1l bnRSZW1vdmVkKCkKIHsKKyAgICBzZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50UmVjdXJzaXZl bHkobV9mdWxsU2NyZWVuRWxlbWVudC5nZXQoKSwgZmFsc2UsIFN0YXJ0V2l0aFBhcmVudCk7CiAg ICAgd2Via2l0Q2FuY2VsRnVsbFNjcmVlbigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4 IDMzYjgwYjlhNWZiMTk3MDkxY2VjNDMwOWMyMjI4YmI3Y2I0NDE2MTAuLmJlNjE5ZDdkODE3MDE3 Yjg1NGNmYzg2MmY1ZTc4NmI3N2E0Y2NjYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0xMDU1 LDcgKzEwNTUsMTIgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlRnVsbFNjcmVlbkVsZW1lbnRP ZlN1YnRyZWUoTm9kZSosIGJvb2wgYW1vbmdDaGlsZHJlbk9ubHkgPSBmYWxzZSk7CiAgICAgYm9v bCBpc0FuaW1hdGluZ0Z1bGxTY3JlZW4oKSBjb25zdDsKICAgICB2b2lkIHNldEFuaW1hdGluZ0Z1 bGxTY3JlZW4oYm9vbCk7Ci0gICAgc3RhdGljIHZvaWQgc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxl bWVudFJlY3Vyc2l2ZWx5KEVsZW1lbnQqLCBib29sKTsKKyAgICAKKyAgICBlbnVtIFJlY3Vyc2lv bk1ldGhvZCB7CisgICAgICAgIFN0YXJ0V2l0aEVsZW1lbnQsCisgICAgICAgIFN0YXJ0V2l0aFBh cmVudAorICAgIH07CisgICAgc3RhdGljIHZvaWQgc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxlbWVu dFJlY3Vyc2l2ZWx5KEVsZW1lbnQqLCBib29sLCBSZWN1cnNpb25NZXRob2QgbWV0aG9kID0gU3Rh cnRXaXRoRWxlbWVudCk7CiAjZW5kaWYKIAogICAgIC8vIFVzZWQgdG8gYWxsb3cgZWxlbWVudCB0 aGF0IGxvYWRzIGRhdGEgd2l0aG91dCBnb2luZyB0aHJvdWdoIGEgRnJhbWVMb2FkZXIgdG8gZGVs YXkgdGhlICdsb2FkJyBldmVudC4K 96887 2011-06-12 12:30:07 -0700 2011-06-12 20:43:29 -0700 Patch bug-62507-20110612123006.patch text/plain 5030 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODg1OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjOGU4ZjA3ZjM4YTUwYmM1 MWVjZjYyMWI4YmMxN2RmMzdjNzk5NzMwLi5lMTZkOTRkODQxMzhkNWJhYmM3OTQxYjlmNTgwZmE0 N2Q4MGNjNzExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzEgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSRUdSRVNTSU9OIChmdWxsIHNjcmVlbiB2 aWRlbyk6IFdhdGNoIEFnYWluIGJ1dHRvbiBpcyBvYnNjdXJlZCBhZnRlciBmdWxsIHNjcmVlbiBw bGF5YmFjayBlbmRzIGF0IEFwcGxlIHRyYWlsZXJzIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyNTA3CisKKyAgICAgICAgTm8gbmV3IHRlc3Rz OyBEUlQgd291bGQgaGF2ZSB0byBiZSBtb2RpZmllZCB0byBkZWxheSBiZXR3ZWVuIHJlY2Vpdmlu ZyBleGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoKSBhbmQgY2FsbGluZyAKKyAgICAgICAgd2Via2l0 V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCgpIHRvIGJlIGFibGUgdG8gdGVzdCB0aGlzLgor CisgICAgICAgIElmIHRoZSBmdWxsLXNjcmVlbiBlbGVtZW50IGlzIHJlbW92ZWQsIGFuZCB3ZWJr aXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KCkgaXMgbm90IGNhbGxlZCBiZWZvcmUKKyAg ICAgICAgZnVsbFNjcmVlbkVsZW1lbnRSZW1vdmVkKCkgcmV0dXJucywgdGhlbiBhbmNlc3RvcnMg b2YgdGhlIGZ1bGwtc2NyZWVuIGVsZW1lbnQgd2lsbCBub3QgaGF2ZSB0aGVpcgorICAgICAgICBj b250YWluc0Z1bGxTY3JlZW5FbGVtZW50IHByb3BlcnR5IHJlbW92ZWQuICBUbyBwcm90ZWN0IGFn YWluc3QgdGhpcywgcmVzZXQgdGhlIHByb3BlcnR5IGJ5IGNhbGxpbmcgCisgICAgICAgIHNldENv bnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNpdmVseSgpIGZyb20gd2l0aGluIGZ1bGxTY3Jl ZW5FbGVtZW50UmVtb3ZlZCgpLgorCisgICAgICAgIFRvIG1ha2UgdGhlIGNhbGxpbmcgY29udmVu dGlvbiBzYW5lciwgYWRkIGFub3RoZXIgcGFyYW1ldGVyIHRvIHNldENvbnRhaW5zRnVsbFNjcmVl bkVsZW1lbnRSZWN1cnNpdmVseSwKKyAgICAgICAgdG8gYWxsb3cgaXQgdG8gYWN0IG9uIHRoZSBw YXNzZWQgaW4gZWxlbWVudCdzIHBhcmVudCByYXRoZXIgdGhhbiB0aGUgZWxlbWVudCBpdHNlbGYu CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1l bnRSZWN1cnNpdmVseSk6IEFjdCBvbiB0aGUgZWxlbWVudCdzIHBhcmVudC4KKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50Ojp3ZWJraXRXaWxsRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6IE1v ZGlmaWVkIGNhbGwgdG8gc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxlbWVudFJlY3Vyc2l2ZWx5Lgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OndlYmtpdFdpbGxFeGl0RnVsbFNjcmVlbkZvckVs ZW1lbnQpOiBNb2RpZmllZCBjYWxsIHRvIHNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1 cnNpdmVseS4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpmdWxsU2NyZWVuRWxlbWVudFJl bW92ZWQpOiBBZGRlZCBjYWxsIHRvIHNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNp dmVseS4KKworMjAxMS0wNi0xMSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBBdm9pZCBmbGFz aGluZyB3aGVuIGV4aXRpbmcgZnVsbC1zY3JlZW4gbW9kZS4KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMzM4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CmluZGV4IDdmZGNkZWYzMjY1NDZjNmE1YzU4YzdjZmZlMGRlMWZlNmE1MGIyN2MuLmI3Zjg4Y2Qy NDIyMTAxNGYwOGE3ZTVlZTQ3MDU1NTY2OTUwMTRjY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw cApAQCAtNDc0NCw4ICs0NzQ0LDEyIEBAIHZvaWQgRG9jdW1lbnQ6OndlYmtpdENhbmNlbEZ1bGxT Y3JlZW4oKQogICAgIHBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5leGl0RnVsbFNjcmVlbkZv ckVsZW1lbnQobV9mdWxsU2NyZWVuRWxlbWVudC5nZXQoKSk7CiB9CiAKLXZvaWQgRG9jdW1lbnQ6 OnNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNpdmVseShFbGVtZW50KiBlbGVtZW50 LCBib29sIGNvbnRhaW5zKQordm9pZCBEb2N1bWVudDo6c2V0Q29udGFpbnNGdWxsU2NyZWVuRWxl bWVudFJlY3Vyc2l2ZWx5KEVsZW1lbnQqIGVsZW1lbnQsIGJvb2wgY29udGFpbnMsIFJlY3Vyc2lv bk1ldGhvZCBtZXRob2QpCiB7CisgICAgQVNTRVJUKGVsZW1lbnQpOworICAgIGlmIChtZXRob2Qg PT0gU3RhcnRXaXRoUGFyZW50KQorICAgICAgICBlbGVtZW50ID0gZWxlbWVudC0+cGFyZW50RWxl bWVudCgpID8gZWxlbWVudC0+cGFyZW50RWxlbWVudCgpIDogZWxlbWVudC0+ZG9jdW1lbnQoKS0+ b3duZXJFbGVtZW50KCk7CisKICAgICB3aGlsZSAoZWxlbWVudCkgewogICAgICAgICBlbGVtZW50 LT5zZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50KGNvbnRhaW5zKTsKICAgICAgICAgZWxlbWVu dCA9IChlbGVtZW50LT5wYXJlbnRFbGVtZW50KCkgPyBlbGVtZW50LT5wYXJlbnRFbGVtZW50KCkg OiBlbGVtZW50LT5kb2N1bWVudCgpLT5vd25lckVsZW1lbnQoKSk7CkBAIC00NzczLDcgKzQ3Nzcs NyBAQCB2b2lkIERvY3VtZW50Ojp3ZWJraXRXaWxsRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChF bGVtZW50KiBlbGVtZW50KQogICAgIGlmIChtX2Z1bGxTY3JlZW5FbGVtZW50ICE9IGRvY3VtZW50 RWxlbWVudCgpKQogICAgICAgICBtX2Z1bGxTY3JlZW5FbGVtZW50LT5kZXRhY2goKTsKIAotICAg IHNldENvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnRSZWN1cnNpdmVseShtX2Z1bGxTY3JlZW5FbGVt ZW50LT5wYXJlbnRFbGVtZW50KCkgPyBtX2Z1bGxTY3JlZW5FbGVtZW50LT5wYXJlbnRFbGVtZW50 KCkgOiBvd25lckVsZW1lbnQoKSwgdHJ1ZSk7CisgICAgc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxl bWVudFJlY3Vyc2l2ZWx5KG1fZnVsbFNjcmVlbkVsZW1lbnQuZ2V0KCksIHRydWUsIFN0YXJ0V2l0 aFBhcmVudCk7CiAgICAgCiAgICAgcmVjYWxjU3R5bGUoRm9yY2UpOwogICAgIApAQCAtNDgwNCw3 ICs0ODA4LDcgQEAgdm9pZCBEb2N1bWVudDo6d2Via2l0RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxl bWVudChFbGVtZW50KikKIAogdm9pZCBEb2N1bWVudDo6d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVu Rm9yRWxlbWVudChFbGVtZW50KikKIHsKLSAgICBzZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50 UmVjdXJzaXZlbHkobV9mdWxsU2NyZWVuRWxlbWVudC0+cGFyZW50RWxlbWVudCgpID8gbV9mdWxs U2NyZWVuRWxlbWVudC0+cGFyZW50RWxlbWVudCgpIDogb3duZXJFbGVtZW50KCksIGZhbHNlKTsK KyAgICBzZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50UmVjdXJzaXZlbHkobV9mdWxsU2NyZWVu RWxlbWVudC5nZXQoKSwgZmFsc2UsIFN0YXJ0V2l0aFBhcmVudCk7CiAgICAgCiAgICAgbV9mdWxs U2NyZWVuRWxlbWVudC0+d2lsbFN0b3BCZWluZ0Z1bGxzY3JlZW5FbGVtZW50KCk7CiAKQEAgLTQ5 MTQsNiArNDkxOCw3IEBAIHZvaWQgRG9jdW1lbnQ6OmZ1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWVy RmlyZWQoVGltZXI8RG9jdW1lbnQ+KikKIAogdm9pZCBEb2N1bWVudDo6ZnVsbFNjcmVlbkVsZW1l bnRSZW1vdmVkKCkKIHsKKyAgICBzZXRDb250YWluc0Z1bGxTY3JlZW5FbGVtZW50UmVjdXJzaXZl bHkobV9mdWxsU2NyZWVuRWxlbWVudC5nZXQoKSwgZmFsc2UsIFN0YXJ0V2l0aFBhcmVudCk7CiAg ICAgd2Via2l0Q2FuY2VsRnVsbFNjcmVlbigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4 IDMzYjgwYjlhNWZiMTk3MDkxY2VjNDMwOWMyMjI4YmI3Y2I0NDE2MTAuLmVlYjg1ZDE5M2NhMzI1 NmNhYzJkZjZlYzhmZDliMTA1ZmM0ZDg2NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0xMDU1 LDcgKzEwNTUsMTIgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlRnVsbFNjcmVlbkVsZW1lbnRP ZlN1YnRyZWUoTm9kZSosIGJvb2wgYW1vbmdDaGlsZHJlbk9ubHkgPSBmYWxzZSk7CiAgICAgYm9v bCBpc0FuaW1hdGluZ0Z1bGxTY3JlZW4oKSBjb25zdDsKICAgICB2b2lkIHNldEFuaW1hdGluZ0Z1 bGxTY3JlZW4oYm9vbCk7Ci0gICAgc3RhdGljIHZvaWQgc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxl bWVudFJlY3Vyc2l2ZWx5KEVsZW1lbnQqLCBib29sKTsKKyAgICAKKyAgICBlbnVtIFJlY3Vyc2lv bk1ldGhvZCB7CisgICAgICAgIFN0YXJ0V2l0aEVsZW1lbnQsCisgICAgICAgIFN0YXJ0V2l0aFBh cmVudAorICAgIH07CisgICAgc3RhdGljIHZvaWQgc2V0Q29udGFpbnNGdWxsU2NyZWVuRWxlbWVu dFJlY3Vyc2l2ZWx5KEVsZW1lbnQqLCBib29sLCBSZWN1cnNpb25NZXRob2QgPSBTdGFydFdpdGhF bGVtZW50KTsKICNlbmRpZgogCiAgICAgLy8gVXNlZCB0byBhbGxvdyBlbGVtZW50IHRoYXQgbG9h ZHMgZGF0YSB3aXRob3V0IGdvaW5nIHRocm91Z2ggYSBGcmFtZUxvYWRlciB0byBkZWxheSB0aGUg J2xvYWQnIGV2ZW50Lgo=