35876 2010-03-08 13:24:35 -0800 HTMLMediaElement style improvements 2010-03-08 14:16:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin webkit-unassigned dglazkov webkit.review.bot oldest_to_newest 197283 0 darin 2010-03-08 13:24:35 -0800 HTMLMediaElement style improvements 197288 1 50243 darin 2010-03-08 13:31:57 -0800 Created attachment 50243 Patch 197293 2 webkit.review.bot 2010-03-08 13:38:40 -0800 Attachment 50243 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/354047 197295 3 50243 jhoneycutt 2010-03-08 13:42:10 -0800 Comment on attachment 50243 Patch r=me 197297 4 darin 2010-03-08 13:45:32 -0800 src/WebMediaPlayerClientImpl.cpp:141: error: ‘WebCore::MediaPlayerClient’ is an inaccessible base of ‘WebCore::HTMLMediaElement’ Frame* frame = static_cast<HTMLMediaElement*>( m_mediaPlayer->mediaPlayerClient())->document()->frame(); m_webMediaPlayer.set(createWebMediaPlayer(this, frame)); If the MediaPlayer is in fact always an HTMLMediaElement, then the class should hold an HTMLMediaElement*, not a MediaPlayer*. It's not safe to downcast. 197302 5 darin 2010-03-08 13:53:29 -0800 My mistake, it’s MediaPlayerClient* that is being downcast. If we really need to find out the Frame* then I think we should add a function to MediaPlayerClient* that returns it rather than doing this cast. 197311 6 darin 2010-03-08 14:16:16 -0800 Committed r55682: <http://trac.webkit.org/changeset/55682> 50243 2010-03-08 13:31:57 -0800 2010-03-08 13:42:10 -0800 Patch bug-35876-20100308133156.patch text/plain 12928 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTY3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzYgQEAKKzIwMTAtMDMtMDggIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTg3NgorCisgICAgICAgIEZpeCBt aW5vciBzdHlsZSBpc3N1ZXMgaW4gSFRNTE1lZGlhRWxlbWVudCBhbmQgY2xhc3NlcyBkZXJpdmVk IGZyb20gaXQuCisgICAgICAgIE1hZGUgbWFueSBwdWJsaWMgbWVtYmVycyBwcml2YXRlIGFuZCBw cm90ZWN0ZWQuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2NyZWVuUmVjdCk6IEdvdCByaWQgb2YgYSBz dHJheSAiY29uc3QiIGFuZAorICAgICAgICByZXRzdHJ1Y3R1cmVkIHRoZSBmdW5jdGlvbiB0byB1 c2UgZWFybHkgcmV0dXJuIGFuZCBnZXQgcmlkIG9mIGEgbG9jYWwuCisKKyAgICAgICAgKiBodG1s L0hUTUxNZWRpYUVsZW1lbnQuaDogTWFkZSBsb3RzIG9mIG1lbWJlcnMgcHJpdmF0ZSBhbmQgc29t ZQorICAgICAgICBwcm90ZWN0ZWQuIEFsc28gdXNlIHByaXZhdGUgaW5oZXJpdGFuY2UgaW5zdGVh ZCBvZiBwdWJsaWMuIFJlbW92ZWQKKyAgICAgICAgc29tZSB1bm5lZWRlZCBpbmNsdWRlcy4KKwor ICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI VE1MVmlkZW9FbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZSk6IFVzZSBwbGF5ZXIoKSBpbnN0 ZWFkCisgICAgICAgIG9mIG1fcGxheWVyOyBIVE1MTWVkaWFFbGVtZW50IGRhdGEgbWVtYmVycyBh cmUgbm93IHByaXZhdGUsIG5vdCBwcm90ZWN0ZWQuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlk ZW9FbGVtZW50OjpzdXBwb3J0c0Z1bGxzY3JlZW4pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxWaWRlb0VsZW1lbnQ6OnZpZGVvV2lkdGgpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxWaWRlb0VsZW1lbnQ6OnZpZGVvSGVpZ2h0KTogRGl0dG8uCisgICAgICAgIChXZWJDb3Jl OjpIVE1MVmlkZW9FbGVtZW50OjpoYXNBdmFpbGFibGVWaWRlb0ZyYW1lKTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50Ojp3ZWJraXRFbnRlckZ1bGxTY3JlZW4pOiBV c2UgaXNGdWxsc2NyZWVuKCkKKyAgICAgICAgaW5zdGVhZCBvZiBtX2lzRnVsbHNjcmVlbjsgc2Ft ZSByZWFzb24uCisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50Ojp3ZWJraXRFeGl0 RnVsbFNjcmVlbik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudDo6 d2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4pOiBEaXR0by4KKworICAgICAgICAqIGh0bWwvSFRN TFZpZGVvRWxlbWVudC5oOiBSZW1vdmVkIGFuIHVubmVlZGVkIGluY2x1ZGUuIE1hZGUgbWFueQor ICAgICAgICBwdWJsaWMgZnVuY3Rpb25zIHByaXZhdGUuIEdvdCByaWQgb2YgdW51c2VkIHBhaW50 IGZ1bmN0aW9uLCB3aGljaCB3YXMKKyAgICAgICAgcmVwbGFjZWQgd2l0aCBwYWludEN1cnJlbnRG cmFtZUluQ29udGV4dCBhIHdoaWxlIGJhY2suCisKIDIwMTAtMDMtMDggIEppYW4gTGkgIDxqaWFu bGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vIHJldmlldy4gRml4IGJ1aWxkIGJyZWFrIG9u IFRpZ2VyIGludGVsIHJlbGVhc2UuCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShy ZXZpc2lvbiA1NTY3NSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTgxMiwxMiArMTgxMiwxMSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 Om1lZGlhVm9sdW1lRGlkQ2hhCiAgICAgdXBkYXRlVm9sdW1lKCk7CiB9CiAKLWNvbnN0IEludFJl Y3QgSFRNTE1lZGlhRWxlbWVudDo6c2NyZWVuUmVjdCgpCitJbnRSZWN0IEhUTUxNZWRpYUVsZW1l bnQ6OnNjcmVlblJlY3QoKQogewotICAgIEludFJlY3QgZWxlbWVudFJlY3Q7Ci0gICAgaWYgKHJl bmRlcmVyKCkpCi0gICAgICAgIGVsZW1lbnRSZWN0ID0gcmVuZGVyZXIoKS0+dmlldygpLT5mcmFt ZVZpZXcoKS0+Y29udGVudHNUb1NjcmVlbihyZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94 UmVjdCgpKTsKLSAgICByZXR1cm4gZWxlbWVudFJlY3Q7CisgICAgaWYgKCFyZW5kZXJlcigpKQor ICAgICAgICByZXR1cm4gSW50UmVjdCgpOworICAgIHJldHVybiByZW5kZXJlcigpLT52aWV3KCkt PmZyYW1lVmlldygpLT5jb250ZW50c1RvU2NyZWVuKHJlbmRlcmVyKCktPmFic29sdXRlQm91bmRp bmdCb3hSZWN0KCkpOwogfQogICAgIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkZWZhdWx0RXZl bnRIYW5kbGVyKEV2ZW50KiBldmVudCkKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2 aXNpb24gNTU2NzUpCisrKyBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCSh3b3JraW5n IGNvcHkpCkBAIC0zMCwxMSArMzAsNiBAQAogCiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKICNp bmNsdWRlICJNZWRpYVBsYXllci5oIgotI2luY2x1ZGUgIlRpbWVyLmgiCi0KLSNpZiBFTkFCTEUo UExVR0lOX1BST1hZX0ZPUl9WSURFTykKLSNpbmNsdWRlICJNZWRpYVBsYXllclByb3h5LmgiCi0j ZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00NCwyMiArMzksOCBAQCBjbGFzcyBN ZWRpYUVycm9yOwogY2xhc3MgS1VSTDsKIGNsYXNzIFRpbWVSYW5nZXM7CiAKLWNsYXNzIEhUTUxN ZWRpYUVsZW1lbnQgOiBwdWJsaWMgSFRNTEVsZW1lbnQsIHB1YmxpYyBNZWRpYVBsYXllckNsaWVu dCB7CitjbGFzcyBIVE1MTWVkaWFFbGVtZW50IDogcHVibGljIEhUTUxFbGVtZW50LCBwcml2YXRl IE1lZGlhUGxheWVyQ2xpZW50IHsKIHB1YmxpYzoKLSAgICB2aXJ0dWFsIH5IVE1MTWVkaWFFbGVt ZW50KCk7Ci0KLSAgICBib29sIGNoZWNrRFREKGNvbnN0IE5vZGUqIG5ld0NoaWxkKTsKLSAgICAK LSAgICB2b2lkIGF0dHJpYnV0ZUNoYW5nZWQoQXR0cmlidXRlKiwgYm9vbCBwcmVzZXJ2ZURlY2xz KTsKLSAgICB2b2lkIHBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZSAqKTsKLQot ICAgIHZpcnR1YWwgYm9vbCByZW5kZXJlcklzTmVlZGVkKFJlbmRlclN0eWxlKik7Ci0gICAgdmly dHVhbCBSZW5kZXJPYmplY3QqIGNyZWF0ZVJlbmRlcmVyKFJlbmRlckFyZW5hKiwgUmVuZGVyU3R5 bGUqKTsKLSAgICB2aXJ0dWFsIHZvaWQgaW5zZXJ0ZWRJbnRvRG9jdW1lbnQoKTsKLSAgICB2aXJ0 dWFsIHZvaWQgcmVtb3ZlZEZyb21Eb2N1bWVudCgpOwotICAgIHZpcnR1YWwgdm9pZCBhdHRhY2go KTsKLSAgICB2aXJ0dWFsIHZvaWQgcmVjYWxjU3R5bGUoU3R5bGVDaGFuZ2UpOwotICAgIAogICAg IE1lZGlhUGxheWVyKiBwbGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3BsYXllci5nZXQoKTsgfQog ICAgIAogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZGVvKCkgY29uc3QgPSAwOwpAQCAtODAsMTEgKzYx LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBzY2hlZHVsZUxvYWQoKTsKICAgICAKLSAgICB2aXJ0 dWFsIHZvaWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCopOwotICAgIAotICAgIC8vIFBhdXNl cyBwbGF5YmFjayB3aXRob3V0IGNoYW5naW5nIGFueSBzdGF0ZXMgb3IgZ2VuZXJhdGluZyBldmVu dHMKLSAgICB2b2lkIHNldFBhdXNlZEludGVybmFsKGJvb2wpOwotICAgIAogICAgIE1lZGlhUGxh eWVyOjpNb3ZpZUxvYWRUeXBlIG1vdmllTG9hZFR5cGUoKSBjb25zdDsKICAgICAKICAgICBib29s IGluQWN0aXZlRG9jdW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2luQWN0aXZlRG9jdW1lbnQ7IH0K QEAgLTE1MSw3ICsxMjcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBiZWdpblNjcnViYmluZygpOwog ICAgIHZvaWQgZW5kU2NydWJiaW5nKCk7CiAKLSAgICBjb25zdCBJbnRSZWN0IHNjcmVlblJlY3Qo KTsKKyAgICBJbnRSZWN0IHNjcmVlblJlY3QoKTsKIAogICAgIGJvb2wgY2FuUGxheSgpIGNvbnN0 OwogCkBAIC0xNTksMTQgKzEzNSwxNSBAQCBwdWJsaWM6CiAKICNpZiBFTkFCTEUoUExVR0lOX1BS T1hZX0ZPUl9WSURFTykKICAgICB2b2lkIHNldE5lZWRXaWRnZXRVcGRhdGUoYm9vbCBuZWVkV2lk Z2V0VXBkYXRlKSB7IG1fbmVlZFdpZGdldFVwZGF0ZSA9IG5lZWRXaWRnZXRVcGRhdGU7IH0KLSAg ICB2b2lkIGRlbGl2ZXJOb3RpZmljYXRpb24oTWVkaWFQbGF5ZXJQcm94eU5vdGlmaWNhdGlvblR5 cGUgbm90aWZpY2F0aW9uKTsKLSAgICB2b2lkIHNldE1lZGlhUGxheWVyUHJveHkoV2ViTWVkaWFQ bGF5ZXJQcm94eSogcHJveHkpOworICAgIHZvaWQgZGVsaXZlck5vdGlmaWNhdGlvbihNZWRpYVBs YXllclByb3h5Tm90aWZpY2F0aW9uVHlwZSk7CisgICAgdm9pZCBzZXRNZWRpYVBsYXllclByb3h5 KFdlYk1lZGlhUGxheWVyUHJveHkqKTsKICAgICBTdHJpbmcgaW5pdGlhbFVSTCgpOwogICAgIHZp cnR1YWwgdm9pZCBmaW5pc2hQYXJzaW5nQ2hpbGRyZW4oKTsKICNlbmRpZgogCiAgICAgYm9vbCBo YXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNvbnN0IHsgcmV0dXJuICFtX3BsYXllciB8fCBtX3Bs YXllci0+aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4oKTsgfQogICAgIAorICAgIGJvb2wgaXNGdWxs c2NyZWVuKCkgY29uc3QgeyByZXR1cm4gbV9pc0Z1bGxzY3JlZW47IH0KICAgICB2b2lkIGVudGVy RnVsbHNjcmVlbigpOwogICAgIHZvaWQgZXhpdEZ1bGxzY3JlZW4oKTsKIApAQCAtMTc4LDcgKzE1 NSwyMiBAQCBwdWJsaWM6CiAKIHByb3RlY3RlZDoKICAgICBIVE1MTWVkaWFFbGVtZW50KGNvbnN0 IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCopOworICAgIHZpcnR1YWwgfkhUTUxNZWRpYUVsZW1l bnQoKTsKIAorICAgIHZpcnR1YWwgdm9pZCBwYXJzZU1hcHBlZEF0dHJpYnV0ZShNYXBwZWRBdHRy aWJ1dGUgKik7CisgICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOworCitwcml2YXRlOgorICAgIHZp cnR1YWwgYm9vbCBjaGVja0RURChjb25zdCBOb2RlKiBuZXdDaGlsZCk7ICAgIAorICAgIHZpcnR1 YWwgdm9pZCBhdHRyaWJ1dGVDaGFuZ2VkKEF0dHJpYnV0ZSosIGJvb2wgcHJlc2VydmVEZWNscyk7 CisgICAgdmlydHVhbCBib29sIHJlbmRlcmVySXNOZWVkZWQoUmVuZGVyU3R5bGUqKTsKKyAgICB2 aXJ0dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJlbmEqLCBSZW5kZXJT dHlsZSopOworICAgIHZpcnR1YWwgdm9pZCBpbnNlcnRlZEludG9Eb2N1bWVudCgpOworICAgIHZp cnR1YWwgdm9pZCByZW1vdmVkRnJvbURvY3VtZW50KCk7CisgICAgdmlydHVhbCB2b2lkIHJlY2Fs Y1N0eWxlKFN0eWxlQ2hhbmdlKTsKKyAgICAKKyAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50 SGFuZGxlcihFdmVudCopOworICAgIAogICAgIGZsb2F0IGdldFRpbWVPZmZzZXRBdHRyaWJ1dGUo Y29uc3QgUXVhbGlmaWVkTmFtZSYsIGZsb2F0IHZhbHVlT25FcnJvcikgY29uc3Q7CiAgICAgdm9p ZCBzZXRUaW1lT2Zmc2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBmbG9hdCB2YWx1 ZSk7CiAgICAgCkBAIC0xOTMsNyArMTg1LDYgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9p ZCB3aWxsTW92ZVRvTmV3T3duZXJEb2N1bWVudCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRNb3Zl VG9OZXdPd25lckRvY3VtZW50KCk7CiAKLXByaXZhdGU6IC8vIE1lZGlhUGxheWVyQ2xpZW50CiAg ICAgdmlydHVhbCBEb2N1bWVudCogbWVkaWFQbGF5ZXJPd25pbmdEb2N1bWVudCgpOwogICAgIHZp cnR1YWwgdm9pZCBtZWRpYVBsYXllck5ldHdvcmtTdGF0ZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKTsK ICAgICB2aXJ0dWFsIHZvaWQgbWVkaWFQbGF5ZXJSZWFkeVN0YXRlQ2hhbmdlZChNZWRpYVBsYXll ciopOwpAQCAtMjEwLDcgKzIwMSw2IEBAIHByaXZhdGU6IC8vIE1lZGlhUGxheWVyQ2xpZW50CiAg ICAgdmlydHVhbCB2b2lkIG1lZGlhUGxheWVyUmVuZGVyaW5nTW9kZUNoYW5nZWQoTWVkaWFQbGF5 ZXIqKTsKICNlbmRpZgogCi1wcml2YXRlOgogICAgIHZvaWQgbG9hZFRpbWVyRmlyZWQoVGltZXI8 SFRNTE1lZGlhRWxlbWVudD4qKTsKICAgICB2b2lkIGFzeW5jRXZlbnRUaW1lckZpcmVkKFRpbWVy PEhUTUxNZWRpYUVsZW1lbnQ+Kik7CiAgICAgdm9pZCBwcm9ncmVzc0V2ZW50VGltZXJGaXJlZChU aW1lcjxIVE1MTWVkaWFFbGVtZW50PiopOwpAQCAtMjY1LDE1ICsyNTUsMTcgQEAgcHJpdmF0ZToK ICAgICBmbG9hdCBtaW5UaW1lU2Vla2FibGUoKSBjb25zdDsKICAgICBmbG9hdCBtYXhUaW1lU2Vl a2FibGUoKSBjb25zdDsKIAotICAgIC8vIFJlc3RyaWN0aW9ucyB0byBjaGFuZ2UgZGVmYXVsdCBi ZWhhdmlvcnMuIFRoaXMgaXMgYSBlZmZlY3RpdmVseSBhIGNvbXBpbGUgdGltZSBjaG9pY2UgYXQg dGhlIG1vbWVudAotICAgIC8vICBiZWNhdXNlIHRoZXJlIGFyZSBubyBhY2Nlc3NvciBtZXRob2Rz LgorICAgIC8vIFBhdXNlcyBwbGF5YmFjayB3aXRob3V0IGNoYW5naW5nIGFueSBzdGF0ZXMgb3Ig Z2VuZXJhdGluZyBldmVudHMKKyAgICB2b2lkIHNldFBhdXNlZEludGVybmFsKGJvb2wpOworCisg ICAgLy8gUmVzdHJpY3Rpb25zIHRvIGNoYW5nZSBkZWZhdWx0IGJlaGF2aW9ycy4gVGhpcyBpcyBl ZmZlY3RpdmVseSBhIGNvbXBpbGUgdGltZSBjaG9pY2UgYXQgdGhlIG1vbWVudAorICAgIC8vIGJl Y2F1c2UgdGhlcmUgYXJlIG5vIGFjY2Vzc29yIGZ1bmN0aW9ucy4KICAgICBlbnVtIEJlaGF2aW9y UmVzdHJpY3Rpb25zIHsKICAgICAgICAgTm9SZXN0cmljdGlvbnMgPSAwLAogICAgICAgICBSZXF1 aXJlVXNlckdlc3R1cmVGb3JMb2FkUmVzdHJpY3Rpb24gPSAxIDw8IDAsCiAgICAgICAgIFJlcXVp cmVVc2VyR2VzdHVyZUZvclJhdGVDaGFuZ2VSZXN0cmljdGlvbiA9IDEgPDwgMSwKICAgICB9Owog Ci1wcm90ZWN0ZWQ6CiAgICAgVGltZXI8SFRNTE1lZGlhRWxlbWVudD4gbV9sb2FkVGltZXI7CiAg ICAgVGltZXI8SFRNTE1lZGlhRWxlbWVudD4gbV9hc3luY0V2ZW50VGltZXI7CiAgICAgVGltZXI8 SFRNTE1lZGlhRWxlbWVudD4gbV9wcm9ncmVzc0V2ZW50VGltZXI7CkBAIC0zMDUsNyArMjk3LDcg QEAgcHJvdGVjdGVkOgogICAgIC8vIGxvYWRpbmcgc3RhdGUKICAgICBlbnVtIExvYWRTdGF0ZSB7 IFdhaXRpbmdGb3JTb3VyY2UsIExvYWRpbmdGcm9tU3JjQXR0ciwgTG9hZGluZ0Zyb21Tb3VyY2VF bGVtZW50IH07CiAgICAgTG9hZFN0YXRlIG1fbG9hZFN0YXRlOwotICAgIEhUTUxTb3VyY2VFbGVt ZW50ICptX2N1cnJlbnRTb3VyY2VOb2RlOworICAgIEhUTUxTb3VyY2VFbGVtZW50KiBtX2N1cnJl bnRTb3VyY2VOb2RlOwogICAgIAogICAgIE93blB0cjxNZWRpYVBsYXllcj4gbV9wbGF5ZXI7CiAK SW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHAJKHJldmlzaW9uIDU1Njc1KQorKysgV2Vi Q29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDQsOCAr MTA0LDggQEAgdm9pZCBIVE1MVmlkZW9FbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJpYgogICAgICAg ICAgICAgICAgIG1faW1hZ2VMb2FkZXIuc2V0KG5ldyBIVE1MSW1hZ2VMb2FkZXIodGhpcykpOwog ICAgICAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZp b3VzRXJyb3IoKTsKICNlbHNlCi0gICAgICAgICAgICBpZiAobV9wbGF5ZXIpCi0gICAgICAgICAg ICAgICAgbV9wbGF5ZXItPnNldFBvc3Rlcihwb3N0ZXIoKSk7CisgICAgICAgICAgICBpZiAocGxh eWVyKCkpCisgICAgICAgICAgICAgICAgcGxheWVyKCktPnNldFBvc3Rlcihwb3N0ZXIoKSk7CiAj ZW5kaWYKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAoYXR0ck5hbWUgPT0gd2lkdGhBdHRyKQpA QCAtMTIyLDcgKzEyMiw3IEBAIGJvb2wgSFRNTFZpZGVvRWxlbWVudDo6c3VwcG9ydHNGdWxsc2Ny ZWUKICAgICBpZiAoIXBhZ2UpIAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIW1f cGxheWVyIHx8ICFtX3BsYXllci0+c3VwcG9ydHNGdWxsc2NyZWVuKCkgfHwgIW1fcGxheWVyLT5o YXNWaWRlbygpKQorICAgIGlmICghcGxheWVyKCkgfHwgIXBsYXllcigpLT5zdXBwb3J0c0Z1bGxz Y3JlZW4oKSB8fCAhcGxheWVyKCktPmhhc1ZpZGVvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIC8vIENoZWNrIHdpdGggdGhlIHBsYXRmb3JtIGNsaWVudC4KQEAgLTEzMSwxNiArMTMx LDE2IEBAIGJvb2wgSFRNTFZpZGVvRWxlbWVudDo6c3VwcG9ydHNGdWxsc2NyZWUKIAogdW5zaWdu ZWQgSFRNTFZpZGVvRWxlbWVudDo6dmlkZW9XaWR0aCgpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX3Bs YXllcikKKyAgICBpZiAoIXBsYXllcigpKQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4g bV9wbGF5ZXItPm5hdHVyYWxTaXplKCkud2lkdGgoKTsKKyAgICByZXR1cm4gcGxheWVyKCktPm5h dHVyYWxTaXplKCkud2lkdGgoKTsKIH0KIAogdW5zaWduZWQgSFRNTFZpZGVvRWxlbWVudDo6dmlk ZW9IZWlnaHQoKSBjb25zdAogewotICAgIGlmICghbV9wbGF5ZXIpCisgICAgaWYgKCFwbGF5ZXIo KSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIG1fcGxheWVyLT5uYXR1cmFsU2l6ZSgp LmhlaWdodCgpOworICAgIHJldHVybiBwbGF5ZXIoKS0+bmF0dXJhbFNpemUoKS5oZWlnaHQoKTsK IH0KIAogdW5zaWduZWQgSFRNTFZpZGVvRWxlbWVudDo6d2lkdGgoKSBjb25zdApAQCAtMTk2LDE2 ICsxOTYsNiBAQCB2b2lkIEhUTUxWaWRlb0VsZW1lbnQ6OnVwZGF0ZVBvc3RlckltYWdlCiAjZW5k aWYKIH0KIAotdm9pZCBIVE1MVmlkZW9FbGVtZW50OjpwYWludChHcmFwaGljc0NvbnRleHQqIGNv bnRleHQsIGNvbnN0IEludFJlY3QmIGRlc3RSZWN0KQotewotICAgIE1lZGlhUGxheWVyKiBwbGF5 ZXIgPSBIVE1MTWVkaWFFbGVtZW50OjpwbGF5ZXIoKTsKLSAgICBpZiAoIXBsYXllcikKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgcGxheWVyLT5zZXRWaXNpYmxlKHRydWUpOyAvLyBNYWtlIHBsYXll ciB2aXNpYmxlIG9yIGl0IHdvbid0IGRyYXcuCi0gICAgcGxheWVyLT5wYWludChjb250ZXh0LCBk ZXN0UmVjdCk7Ci19Ci0KIHZvaWQgSFRNTFZpZGVvRWxlbWVudDo6cGFpbnRDdXJyZW50RnJhbWVJ bkNvbnRleHQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkZXN0UmVj dCkKIHsKICAgICBNZWRpYVBsYXllciogcGxheWVyID0gSFRNTE1lZGlhRWxlbWVudDo6cGxheWVy KCk7CkBAIC0yMTgsMTUgKzIwOCwxNSBAQCB2b2lkIEhUTUxWaWRlb0VsZW1lbnQ6OnBhaW50Q3Vy cmVudEZyYW1lCiAKIGJvb2wgSFRNTFZpZGVvRWxlbWVudDo6aGFzQXZhaWxhYmxlVmlkZW9GcmFt ZSgpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX3BsYXllcikKKyAgICBpZiAoIXBsYXllcigpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgcmV0dXJuIG1fcGxheWVyLT5oYXNBdmFpbGFi bGVWaWRlb0ZyYW1lKCk7CisgICAgcmV0dXJuIHBsYXllcigpLT5oYXNBdmFpbGFibGVWaWRlb0Zy YW1lKCk7CiB9CiAKIHZvaWQgSFRNTFZpZGVvRWxlbWVudDo6d2Via2l0RW50ZXJGdWxsU2NyZWVu KGJvb2wgaXNVc2VyR2VzdHVyZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgaWYgKG1faXNG dWxsc2NyZWVuKQorICAgIGlmIChpc0Z1bGxzY3JlZW4oKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgLy8gR2VuZXJhdGUgYW4gZXhjZXB0aW9uIGlmIHRoaXMgaXNuJ3QgY2FsbGVkIGluIHJlc3Bv bnNlIHRvIGEgdXNlciBnZXN0dXJlLCBvciBpZiB0aGUgCkBAIC0yNDEsNyArMjMxLDcgQEAgdm9p ZCBIVE1MVmlkZW9FbGVtZW50Ojp3ZWJraXRFbnRlckZ1bGxTYwogCiB2b2lkIEhUTUxWaWRlb0Vs ZW1lbnQ6OndlYmtpdEV4aXRGdWxsU2NyZWVuKCkKIHsKLSAgICBpZiAobV9pc0Z1bGxzY3JlZW4p CisgICAgaWYgKGlzRnVsbHNjcmVlbigpKQogICAgICAgICBleGl0RnVsbHNjcmVlbigpOwogfQog CkBAIC0yNTIsNyArMjQyLDcgQEAgYm9vbCBIVE1MVmlkZW9FbGVtZW50Ojp3ZWJraXRTdXBwb3J0 c0Z1bAogCiBib29sIEhUTUxWaWRlb0VsZW1lbnQ6OndlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVu KCkKIHsKLSAgICByZXR1cm4gbV9pc0Z1bGxzY3JlZW47CisgICAgcmV0dXJuIGlzRnVsbHNjcmVl bigpOwogfQogCiAKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaAkocmV2aXNpb24gNTU2NzUp CisrKyBXZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0y OSw3ICsyOSw2IEBACiAjaWYgRU5BQkxFKFZJREVPKQogCiAjaW5jbHVkZSAiSFRNTE1lZGlhRWxl bWVudC5oIgotI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CkBAIC0zOSwyMCArMzgsNiBAQCBjbGFzcyBIVE1MVmlkZW9FbGVtZW50IDogcHVibGljIEhUTUxN ZWRpCiBwdWJsaWM6CiAgICAgSFRNTFZpZGVvRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwg RG9jdW1lbnQqKTsKIAotICAgIHZpcnR1YWwgaW50IHRhZ1ByaW9yaXR5KCkgY29uc3QgeyByZXR1 cm4gNTsgfQotICAgIHZpcnR1YWwgYm9vbCByZW5kZXJlcklzTmVlZGVkKFJlbmRlclN0eWxlKik7 Ci0jaWYgIUVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQotICAgIHZpcnR1YWwgUmVuZGVy T2JqZWN0KiBjcmVhdGVSZW5kZXJlcihSZW5kZXJBcmVuYSosIFJlbmRlclN0eWxlKik7Ci0jZW5k aWYKLSAgICB2aXJ0dWFsIHZvaWQgYXR0YWNoKCk7Ci0gICAgdmlydHVhbCB2b2lkIGRldGFjaCgp OwotICAgIHZpcnR1YWwgdm9pZCBwYXJzZU1hcHBlZEF0dHJpYnV0ZShNYXBwZWRBdHRyaWJ1dGUq IGF0dHIpOwotICAgIHZpcnR1YWwgYm9vbCBpc1ZpZGVvKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsg fQotICAgIHZpcnR1YWwgYm9vbCBoYXNWaWRlbygpIGNvbnN0IHsgcmV0dXJuIHBsYXllcigpICYm IHBsYXllcigpLT5oYXNWaWRlbygpOyB9Ci0gICAgdmlydHVhbCBib29sIHN1cHBvcnRzRnVsbHNj cmVlbigpIGNvbnN0OwotICAgIHZpcnR1YWwgYm9vbCBpc1VSTEF0dHJpYnV0ZShBdHRyaWJ1dGUq KSBjb25zdDsKLSAgICB2aXJ0dWFsIGNvbnN0IFF1YWxpZmllZE5hbWUmIGltYWdlU291cmNlQXR0 cmlidXRlTmFtZSgpIGNvbnN0OwotCiAgICAgdW5zaWduZWQgd2lkdGgoKSBjb25zdDsKICAgICB2 b2lkIHNldFdpZHRoKHVuc2lnbmVkKTsKICAgICB1bnNpZ25lZCBoZWlnaHQoKSBjb25zdDsKQEAg LTcyLDExICs1NywyNCBAQCBwdWJsaWM6CiAKICAgICBib29sIHNob3VsZERpc3BsYXlQb3N0ZXJJ bWFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkRGlzcGxheVBvc3RlckltYWdlOyB9CiAKLSAg ICB2b2lkIHBhaW50KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsKICAgICAvLyBV c2VkIGJ5IGNhbnZhcyB0byBnYWluIHJhdyBwaXhlbCBhY2Nlc3MKICAgICB2b2lkIHBhaW50Q3Vy cmVudEZyYW1lSW5Db250ZXh0KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsKIAog cHJpdmF0ZToKKyAgICB2aXJ0dWFsIGludCB0YWdQcmlvcml0eSgpIGNvbnN0IHsgcmV0dXJuIDU7 IH0KKyAgICB2aXJ0dWFsIGJvb2wgcmVuZGVyZXJJc05lZWRlZChSZW5kZXJTdHlsZSopOworI2lm ICFFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykKKyAgICB2aXJ0dWFsIFJlbmRlck9iamVj dCogY3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJlbmEqLCBSZW5kZXJTdHlsZSopOworI2VuZGlmCisg ICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOworICAgIHZpcnR1YWwgdm9pZCBkZXRhY2goKTsKKyAg ICB2aXJ0dWFsIHZvaWQgcGFyc2VNYXBwZWRBdHRyaWJ1dGUoTWFwcGVkQXR0cmlidXRlKik7Cisg ICAgdmlydHVhbCBib29sIGlzVmlkZW8oKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CisgICAgdmly dHVhbCBib29sIGhhc1ZpZGVvKCkgY29uc3QgeyByZXR1cm4gcGxheWVyKCkgJiYgcGxheWVyKCkt Pmhhc1ZpZGVvKCk7IH0KKyAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNGdWxsc2NyZWVuKCkgY29u c3Q7CisgICAgdmlydHVhbCBib29sIGlzVVJMQXR0cmlidXRlKEF0dHJpYnV0ZSopIGNvbnN0Owor ICAgIHZpcnR1YWwgY29uc3QgUXVhbGlmaWVkTmFtZSYgaW1hZ2VTb3VyY2VBdHRyaWJ1dGVOYW1l KCkgY29uc3Q7CisKICAgICB2aXJ0dWFsIGJvb2wgaGFzQXZhaWxhYmxlVmlkZW9GcmFtZSgpIGNv bnN0OwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVQb3N0ZXJJbWFnZSgpOwogCg==