23737 2009-02-04 12:57:05 -0800 HTMLMediaElement should encapsulate more of the logic needed by default controller 2009-03-02 11:51:56 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 eric.carlson webkit-unassigned oldest_to_newest 108319 0 eric.carlson 2009-02-04 12:57:05 -0800 Too much HTMLMediaElement internal state and logic is needed by MediaControlElements and RenderMedia to implement the default media controls. The media element should offer higher level methods to keep this state internal so it will be easier to change the logic when we update to the current spec. 108323 1 27324 eric.carlson 2009-02-04 13:48:28 -0800 Created attachment 27324 proposed patch 108983 2 27324 koivisto 2009-02-09 09:43:13 -0800 Comment on attachment 27324 proposed patch r=me > + if (m_pausedInternal) { > + setPausedInternal(false); > + } No need for {} 109002 3 eric.carlson 2009-02-09 11:50:37 -0800 Committed revision 40789 27324 2009-02-04 13:48:28 -0800 2009-02-09 09:43:13 -0800 proposed patch control_logic_patch.txt text/plain 8552 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDYyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDktMDItMDQgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6dG9nZ2xlUGxheVN0YXRlKTogTmV3LCB0b2dnbGUgYmV0d2VlbiBwbGF5aW5n IGFuZCBwYXVzZWQgc3RhdGUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpi ZWdpblNjcnViYmluZyk6IE5ldywgcGF1c2UgYXMgbmVjZXNzYXJ5IGZvciBzY3J1YmJpbmcgbW9k ZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmVuZFNjcnViYmluZyk6IE5l dywgcmVzdW1lIHBsYXliYWNrIGlmIHBhdXNlZCBmb3Igc2NydWJiaW5nIG1vZGUuCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Omhhc1ZpZGVvKTogTmV3LCBhZGRlZCBzbyBjbGllbnRzIGRvbid0IG5lZWQgdG8g YWNjZXNzIE1lZGlhUGxheWVyIGRpcmVjdGx5LgorICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxl bWVudC5oOgorCisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50OjpoYXNWaWRlbyk6 IE5ldy4KKworICAgICAgICAqIHJlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2 ZW50SGFuZGxlcik6IFVzZSBuZXcgbWVkaWEgZWxlbWVudCAKKyAgICAgICAgdG9nZ2xlUGxheVN0 YXRlIG1ldGhvZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6IFRlbGwgbWVkaWEgZWxlbWVudCB3aGVuIHNjcnViYmlu ZworICAgICAgICBiZWdpbnMgYW5kIGVuZHMgc28gaXQgY2FuIGRlYWwgd2l0aCBwYXVzaW5nIGxv Z2ljLiBEb24ndCBjYWxsIHNldEN1cnJlbnRUaW1lIHVubGVzcyB0aGUgdGltZQorICAgICAgICB3 aWxsIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJNZWRpYTo6dXBkYXRlQ29udHJvbHMpOiBBc2sgbWVkaWEgZWxl bWVudCBpZiBpdCBpcyBhYmxlIHRvIHBsYXkgaW5zdGVhZCBvZiBpbmNsdWRpbmcKKyAgICAgICAg aW50ZXJuYWwgbG9naWMgaGVyZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lZGlhOjp1cGRh dGVDb250cm9sVmlzaWJpbGl0eSk6IERpdHRvLgorCiAyMDA5LTAyLTA0ICBEYXZpZCBLaWx6ZXIg IDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2hUcmFjZXI6IFtSRUdSRVNTSU9O XSA1MyBjcmFzaGVzIGluIFNhZmFyaSBhdCBjb20uYXBwbGUuV2ViQ29yZTogV2ViQ29yZTo6TGVn YWN5V2ViQXJjaGl2ZTo6Y3JlYXRlICsgMjcwNgpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcAkocmV2aXNpb24gNDA2MTIpCisrKyBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTgwNyw2ICs4MDcsMzkgQEAgdm9pZCBIVE1MTWVkaWFFbGVt ZW50OjpzZXRNdXRlZChib29sIG11dAogICAgIH0KIH0KIAordm9pZCBIVE1MTWVkaWFFbGVtZW50 Ojp0b2dnbGVQbGF5U3RhdGUoRXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAgaWYgKGNhblBsYXko KSkKKyAgICAgICAgcGxheShlYyk7CisgICAgZWxzZSAKKyAgICAgICAgcGF1c2UoZWMpOworfQor Cit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmJlZ2luU2NydWJiaW5nKCkKK3sKKyAgICBpZiAoIXBh dXNlZCgpKSB7CisgICAgICAgIGlmIChlbmRlZCgpKSB7CisgICAgICAgICAgICAvLyBiZWNhdXNl IGEgbWVkaWEgZWxlbWVudCBzdGF5cyBpbiBub24tcGF1c2VkIHN0YXRlIHdoZW4gaXQgcmVhY2hl cyBlbmQsIHBsYXliYWNrIHJlc3VtZXMgCisgICAgICAgICAgICAvLyAgd2hlbiB0aGUgc2xpZGVy IGlzIGRyYWdnZWQgZnJvbSB0aGUgZW5kIHRvIGFub3RoZXIgcG9zaXRpb24gdW5sZXNzIHdlIHBh dXNlIGZpcnN0LiBkbyAKKyAgICAgICAgICAgIC8vICBhICJoYXJkIHBhdXNlIiBzbyBhbiBldmVu dCBpcyBnZW5lcmF0ZWQsIHNpbmNlIHdlIHdhbnQgdG8gc3RheSBwYXVzZWQgYWZ0ZXIgc2NydWJi aW5nIGZpbmlzaGVzCisgICAgICAgICAgICBFeGNlcHRpb25Db2RlIGVjOworICAgICAgICAgICAg cGF1c2UoZWMpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gbm90IGF0IHRoZSBl bmQgYnV0IHdlIHN0aWxsIHdhbnQgdG8gcGF1c2UgcGxheWJhY2sgc28gdGhlIG1lZGlhIGVuZ2lu ZSBkb2Vzbid0IHRyeSB0bworICAgICAgICAgICAgLy8gIGNvbnRpbnVlIHBsYXlpbmcgZHVyaW5n IHNjcnViYmluZy4gcGF1c2Ugd2l0aG91dCBnZW5lcmF0aW5nIGFuIGV2ZW50IGFzIHdlIHdpbGwg CisgICAgICAgICAgICAvLyAgdW5wYXVzZSBhZnRlciBzY3J1YmJpbmcgZmluaXNoZXMKKyAgICAg ICAgICAgIHNldFBhdXNlZEludGVybmFsKHRydWUpOworICAgICAgICB9CisgICAgfQorfQorCit2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmVuZFNjcnViYmluZygpCit7CisgICAgaWYgKG1fcGF1c2Vk SW50ZXJuYWwpIHsKKyAgICAgICAgc2V0UGF1c2VkSW50ZXJuYWwoZmFsc2UpOworICAgIH0KK30K KwogYm9vbCBIVE1MTWVkaWFFbGVtZW50OjpjYW5QbGF5KCkgY29uc3QKIHsKICAgICByZXR1cm4g cGF1c2VkKCkgfHwgZW5kZWQoKSB8fCBuZXR3b3JrU3RhdGUoKSA8IExPQURFRF9NRVRBREFUQTsK SW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gNDA2MTIpCisrKyBXZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01OCw2ICs1OCw3IEBA IHB1YmxpYzoKICAgICBNZWRpYVBsYXllciogcGxheWVyKCkgY29uc3QgeyByZXR1cm4gbV9wbGF5 ZXIuZ2V0KCk7IH0KICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNWaWRlbygpIGNvbnN0IHsgcmV0 dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGhhc1ZpZGVvKCkgY29uc3QgeyByZXR1cm4g ZmFsc2U7IH0KICAgICAKICAgICB2b2lkIHNjaGVkdWxlTG9hZCgpOwogICAgIApAQCAtMTI2LDYg KzEyNyw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFZvbHVtZShmbG9hdCwgRXhjZXB0aW9uQ29k ZSYpOwogICAgIGJvb2wgbXV0ZWQoKSBjb25zdDsKICAgICB2b2lkIHNldE11dGVkKGJvb2wpOwor ICAgIHZvaWQgdG9nZ2xlUGxheVN0YXRlKEV4Y2VwdGlvbkNvZGUmIGVjKTsKKyAgICB2b2lkIGJl Z2luU2NydWJiaW5nKCk7CisgICAgdm9pZCBlbmRTY3J1YmJpbmcoKTsKIAogICAgIGJvb2wgY2Fu UGxheSgpIGNvbnN0OwogCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmgJKHJldmlzaW9uIDQw NjEyKQorKysgV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaAkod29ya2luZyBjb3B5KQpA QCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaCgpOwogICAg IHZpcnR1YWwgdm9pZCBwYXJzZU1hcHBlZEF0dHJpYnV0ZShNYXBwZWRBdHRyaWJ1dGUqIGF0dHIp OwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZGVvKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQorICAg IHZpcnR1YWwgYm9vbCBoYXNWaWRlbygpIGNvbnN0IHsgcmV0dXJuIHBsYXllcigpICYmIHBsYXll cigpLT5oYXNWaWRlbygpOyB9CiAgICAgdmlydHVhbCBib29sIGlzVVJMQXR0cmlidXRlKEF0dHJp YnV0ZSopIGNvbnN0OwogICAgIHZpcnR1YWwgY29uc3QgUXVhbGlmaWVkTmFtZSYgaW1hZ2VTb3Vy Y2VBdHRyaWJ1dGVOYW1lKCkgY29uc3Q7CiAKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL01lZGlh Q29udHJvbEVsZW1lbnRzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9NZWRp YUNvbnRyb2xFbGVtZW50cy5jcHAJKHJldmlzaW9uIDQwNjEyKQorKysgV2ViQ29yZS9yZW5kZXJp bmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsMTAgKzE2 Niw3IEBAIHZvaWQgTWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1lbnQ6OmRlZmEKIHsKICAgICBp ZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCkgewogICAgICAgICBF eGNlcHRpb25Db2RlIGVjOwotICAgICAgICBpZiAobV9tZWRpYUVsZW1lbnQtPmNhblBsYXkoKSkK LSAgICAgICAgICAgIG1fbWVkaWFFbGVtZW50LT5wbGF5KGVjKTsKLSAgICAgICAgZWxzZSAKLSAg ICAgICAgICAgIG1fbWVkaWFFbGVtZW50LT5wYXVzZShlYyk7CisgICAgICAgIG1fbWVkaWFFbGVt ZW50LT50b2dnbGVQbGF5U3RhdGUoZWMpOwogICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRs ZWQoKTsKICAgICB9CiAgICAgSFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihl dmVudCk7CkBAIC0yMzUsMzMgKzIzMiwyNyBAQCBNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ6 Ok1lZGlhQ29udHJvCiAKIHZvaWQgTWVkaWFDb250cm9sVGltZWxpbmVFbGVtZW50OjpkZWZhdWx0 RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKIHsKLSAgICBSZW5kZXJTbGlkZXIqIHNsaWRlciA9 IHN0YXRpY19jYXN0PFJlbmRlclNsaWRlcio+KHJlbmRlcmVyKCkpOwotICAgIGJvb2wgb2xkSW5E cmFnTW9kZSA9IHNsaWRlciAmJiBzbGlkZXItPmluRHJhZ01vZGUoKTsKLSAgICBmbG9hdCBvbGRU aW1lID0gbmFycm93UHJlY2lzaW9uVG9GbG9hdCh2YWx1ZSgpLnRvRG91YmxlKCkpOwotICAgIGJv b2wgb2xkRW5kZWQgPSBtX21lZGlhRWxlbWVudC0+ZW5kZWQoKTsKKyAgICBpZiAoZXZlbnQtPnR5 cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQpCisgICAgICAgIG1fbWVkaWFFbGVt ZW50LT5iZWdpblNjcnViYmluZygpOwogCiAgICAgSFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2 ZW50SGFuZGxlcihldmVudCk7CiAKLSAgICBmbG9hdCB0aW1lID0gbmFycm93UHJlY2lzaW9uVG9G bG9hdCh2YWx1ZSgpLnRvRG91YmxlKCkpOwotICAgIGlmIChvbGRUaW1lICE9IHRpbWUgfHwgZXZl bnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuaW5wdXRFdmVudCkgewotICAgICAgICBFeGNlcHRp b25Db2RlIGVjOwotICAgICAgICBtX21lZGlhRWxlbWVudC0+c2V0Q3VycmVudFRpbWUodGltZSwg ZWMpOworICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2VvdmVyRXZl bnQgfHwgZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2VvdXRFdmVudCB8fCBldmVu dC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW1vdmVFdmVudCApIHsKKyAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIC8vIE1lZGlhIGVsZW1lbnQgc3RheXMgaW4gbm9uLXBhdXNlZCBz dGF0ZSB3aGVuIGl0IHJlYWNoZXMgZW5kLiBJZiB0aGUgc2xpZGVyIGlzIG5vdyBkcmFnZ2VkCi0g ICAgLy8gdG8gc29tZSBvdGhlciBwb3NpdGlvbiB0aGUgcGxheWJhY2sgcmVzdW1lcyB3aGljaCBk b2VzIG5vdCBtYXRjaCB1c3VhbCBtZWRpYSBwbGF5ZXIgVUlzLgotICAgIC8vIEdldCB0aGUgZXhw ZWN0ZWQgYmVoYXZpb3IgYnkgcGF1c2luZyBleHBsaWNpdGx5IGluIHRoaXMgY2FzZS4KLSAgICBp ZiAob2xkRW5kZWQgJiYgIW1fbWVkaWFFbGVtZW50LT5lbmRlZCgpICYmICFtX21lZGlhRWxlbWVu dC0+cGF1c2VkKCkpIHsKKyAgICBmbG9hdCB0aW1lID0gbmFycm93UHJlY2lzaW9uVG9GbG9hdCh2 YWx1ZSgpLnRvRG91YmxlKCkpOworICAgIGlmICh0aW1lICE9IG1fbWVkaWFFbGVtZW50LT5jdXJy ZW50VGltZSgpKSB7CiAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWM7Ci0gICAgICAgIG1fbWVkaWFF bGVtZW50LT5wYXVzZShlYyk7CisgICAgICAgIG1fbWVkaWFFbGVtZW50LT5zZXRDdXJyZW50VGlt ZSh0aW1lLCBlYyk7CiAgICAgfQogCi0gICAgLy8gUGF1c2UgcGxheWJhY2sgZHVyaW5nIGRyYWcs IGJ1dCBkbyBpdCB3aXRob3V0IHVzaW5nIERPTSBBUEkgd2hpY2ggd291bGQgZ2VuZXJhdGUgZXZl bnRzIAotICAgIGJvb2wgaW5EcmFnTW9kZSA9IHNsaWRlciAmJiBzbGlkZXItPmluRHJhZ01vZGUo KTsKLSAgICBpZiAoaW5EcmFnTW9kZSAhPSBvbGRJbkRyYWdNb2RlKQotICAgICAgICBtX21lZGlh RWxlbWVudC0+c2V0UGF1c2VkSW50ZXJuYWwoaW5EcmFnTW9kZSk7Ci0gICAgaWYgKGluRHJhZ01v ZGUpCisgICAgUmVuZGVyU2xpZGVyKiBzbGlkZXIgPSBzdGF0aWNfY2FzdDxSZW5kZXJTbGlkZXIq PihyZW5kZXJlcigpKTsKKyAgICBpZiAoc2xpZGVyICYmIHNsaWRlci0+aW5EcmFnTW9kZSgpKQog ICAgICAgICBzdGF0aWNfY2FzdDxSZW5kZXJNZWRpYSo+KG1fbWVkaWFFbGVtZW50LT5yZW5kZXJl cigpKS0+dXBkYXRlVGltZURpc3BsYXkoKTsKKworICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2 ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQpCisgICAgICAgIG1fbWVkaWFFbGVtZW50LT5lbmRTY3J1 YmJpbmcoKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ6OnVwZGF0ZShi b29sIHVwZGF0ZUR1cmF0aW9uKSAKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlh LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHAJKHJl dmlzaW9uIDQwNjEyKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNzksNyArMjc5LDcgQEAgdm9pZCBSZW5kZXJNZWRpYTo6dXBkYXRlQ29u dHJvbHMoKQogICAgICAgICBjcmVhdGVGdWxsc2NyZWVuQnV0dG9uKCk7CiAgICAgfQogCi0gICAg aWYgKG1lZGlhLT5wYXVzZWQoKSB8fCBtZWRpYS0+ZW5kZWQoKSB8fCBtZWRpYS0+bmV0d29ya1N0 YXRlKCkgPCBIVE1MTWVkaWFFbGVtZW50OjpMT0FERURfTUVUQURBVEEpIHsKKyAgICBpZiAobWVk aWEtPmNhblBsYXkoKSkgewogICAgICAgICBpZiAobV90aW1lVXBkYXRlVGltZXIuaXNBY3RpdmUo KSkKICAgICAgICAgICAgIG1fdGltZVVwZGF0ZVRpbWVyLnN0b3AoKTsKICAgICB9IGVsc2UgaWYg KHN0eWxlKCktPnZpc2liaWxpdHkoKSA9PSBWSVNJQkxFICYmIG1fdGltZWxpbmUgJiYgbV90aW1l bGluZS0+cmVuZGVyZXIoKSAmJiBtX3RpbWVsaW5lLT5yZW5kZXJlcigpLT5zdHlsZSgpLT5kaXNw bGF5KCkgIT0gTk9ORSApIHsKQEAgLTM1MSwxMSArMzUxLDExIEBAIHZvaWQgUmVuZGVyTWVkaWE6 OnVwZGF0ZUNvbnRyb2xWaXNpYmlsaXQKIAogICAgIC8vIERvbid0IGZhZGUgZm9yIGF1ZGlvIGNv bnRyb2xzLgogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhID0gbWVkaWFFbGVtZW50KCk7Ci0g ICAgaWYgKHBsYXllcigpICYmICFwbGF5ZXIoKS0+aGFzVmlkZW8oKSB8fCAhbWVkaWEtPmlzVmlk ZW8oKSkKKyAgICBpZiAoIW1lZGlhLT5oYXNWaWRlbygpKQogICAgICAgICByZXR1cm47CiAKICAg ICAvLyBkbyBmYWRpbmcgbWFudWFsbHksIGNzcyBhbmltYXRpb25zIGRvbid0IHdvcmsgd2VsbCB3 aXRoIHNoYWRvdyB0cmVlcwotICAgIGJvb2wgdmlzaWJsZSA9IHN0eWxlKCktPnZpc2liaWxpdHko KSA9PSBWSVNJQkxFICYmIChtX21vdXNlT3ZlciB8fCBtZWRpYS0+cGF1c2VkKCkgfHwgbWVkaWEt PmVuZGVkKCkgfHwgbWVkaWEtPm5ldHdvcmtTdGF0ZSgpIDwgSFRNTE1lZGlhRWxlbWVudDo6TE9B REVEX01FVEFEQVRBKTsKKyAgICBib29sIHZpc2libGUgPSBzdHlsZSgpLT52aXNpYmlsaXR5KCkg PT0gVklTSUJMRSAmJiAobV9tb3VzZU92ZXIgfHwgbWVkaWEtPmNhblBsYXkoKSk7CiAgICAgaWYg KHZpc2libGUgPT0gKG1fb3BhY2l0eUFuaW1hdGlvblRvID4gMCkpCiAgICAgICAgIHJldHVybjsK IAo=