104720 2012-12-11 14:42:46 -0800 Make Video Track compile on Windows in debug mode. 2012-12-11 16:20:48 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned ap eric.carlson sam thorton oldest_to_newest 788818 0 roger_fong 2012-12-11 14:42:46 -0800 There were two problems after enabling Video Track on Windows with compiling in debug mode. 1. urlForLogging method was defined in both HTMLMediaElement.cpp and HTMLTrackElement.cpp. On Windows all the HTMLElements sources are included in an AllInOne source file, so the definitions conflicted. Fixed by renaming the definition in each source file. 2. Logging.h was included in header PODRedBlackTree.h. Including Logging.h so causes the LOG_CHANNEL_PREFIX incorrectly defined as "Log" instead of "WebKitLog" in WebView.cpp. 788837 1 ap 2012-12-11 15:04:45 -0800 > 2. Logging.h was included in header PODRedBlackTree.h. Including Logging.h so causes the LOG_CHANNEL_PREFIX incorrectly defined as "Log" instead of "WebKitLog" in WebView.cpp. I'm fixing that in bug 104718. 788873 2 178896 roger_fong 2012-12-11 15:37:40 -0800 Created attachment 178896 patch Just fixing #1 then. 788936 3 roger_fong 2012-12-11 16:20:48 -0800 committed r137378 178896 2012-12-11 15:37:40 -0800 2012-12-11 15:55:17 -0800 patch fix_debug.patch text/plain 6691 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24g MTM3MDAwKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTI2LDcgKzEyNiw3IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKICNpZiAhTE9HX0RJU0FCTEVECi1zdGF0aWMgU3RyaW5nIHVybEZv ckxvZ2dpbmcoY29uc3QgS1VSTCYgdXJsKQorc3RhdGljIFN0cmluZyB1cmxGb3JMb2dnaW5nTWVk aWEoY29uc3QgS1VSTCYgdXJsKQogewogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBtYXhpbXVt VVJMTGVuZ3RoRm9yTG9nZ2luZyA9IDEyODsKIApAQCAtOTQwLDcgKzk0MCw3IEBAIHZvaWQgSFRN TE1lZGlhRWxlbWVudDo6bG9hZFJlc291cmNlKGNvbnMKIHsKICAgICBBU1NFUlQoaXNTYWZlVG9M b2FkVVJMKGluaXRpYWxVUkwsIENvbXBsYWluKSk7CiAKLSAgICBMT0coTWVkaWEsICJIVE1MTWVk aWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UoJXMsICVzLCAlcykiLCB1cmxGb3JMb2dnaW5nKGluaXRp YWxVUkwpLnV0ZjgoKS5kYXRhKCksIGNvbnRlbnRUeXBlLnJhdygpLnV0ZjgoKS5kYXRhKCksIGtl eVN5c3RlbS51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50 Ojpsb2FkUmVzb3VyY2UoJXMsICVzLCAlcykiLCB1cmxGb3JMb2dnaW5nTWVkaWEoaW5pdGlhbFVS TCkudXRmOCgpLmRhdGEoKSwgY29udGVudFR5cGUucmF3KCkudXRmOCgpLmRhdGEoKSwga2V5U3lz dGVtLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQoKS0+ZnJh bWUoKTsKICAgICBpZiAoIWZyYW1lKSB7CkBAIC05OTIsMTEgKzk5MiwxMSBAQCB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJjZShjb25zCiAjaWYgIVBMQVRGT1JNKENIUk9NSVVNKQog ICAgIGlmIChyZXNvdXJjZSkgewogICAgICAgICB1cmwgPSBjcmVhdGVGaWxlVVJMRm9yQXBwbGlj YXRpb25DYWNoZVJlc291cmNlKHJlc291cmNlLT5wYXRoKCkpOwotICAgICAgICBMT0coTWVkaWEs ICJIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UgLSB3aWxsIGxvYWQgZnJvbSBhcHAgY2Fj aGUgLT4gJXMiLCB1cmxGb3JMb2dnaW5nKHVybCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIExP RyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJjZSAtIHdpbGwgbG9hZCBmcm9t IGFwcCBjYWNoZSAtPiAlcyIsIHVybEZvckxvZ2dpbmdNZWRpYSh1cmwpLnV0ZjgoKS5kYXRhKCkp OwogICAgIH0KICNlbmRpZgogCi0gICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6bG9h ZFJlc291cmNlIC0gbV9jdXJyZW50U3JjIC0+ICVzIiwgdXJsRm9yTG9nZ2luZyhtX2N1cnJlbnRT cmMpLnV0ZjgoKS5kYXRhKCkpOworICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6Omxv YWRSZXNvdXJjZSAtIG1fY3VycmVudFNyYyAtPiAlcyIsIHVybEZvckxvZ2dpbmdNZWRpYShtX2N1 cnJlbnRTcmMpLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgaWYgKG1fc2VuZFByb2dyZXNzRXZlbnRz KSAKICAgICAgICAgc3RhcnRQcm9ncmVzc0V2ZW50VGltZXIoKTsKQEAgLTEzOTcsNyArMTM5Nyw3 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dGV4dFRyYWNrUmVtb3ZlQ3UKIGJvb2wgSFRNTE1l ZGlhRWxlbWVudDo6aXNTYWZlVG9Mb2FkVVJMKGNvbnN0IEtVUkwmIHVybCwgSW52YWxpZFVSTEFj dGlvbiBhY3Rpb25JZkludmFsaWQpCiB7CiAgICAgaWYgKCF1cmwuaXNWYWxpZCgpKSB7Ci0gICAg ICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmlzU2FmZVRvTG9hZFVSTCglcykgLT4g RkFMU0UgYmVjYXVzZSB1cmwgaXMgaW52YWxpZCIsIHVybEZvckxvZ2dpbmcodXJsKS51dGY4KCku ZGF0YSgpKTsKKyAgICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6aXNTYWZlVG9M b2FkVVJMKCVzKSAtPiBGQUxTRSBiZWNhdXNlIHVybCBpcyBpbnZhbGlkIiwgdXJsRm9yTG9nZ2lu Z01lZGlhKHVybCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9 CiAKQEAgLTE0MDUsMTIgKzE0MDUsMTIgQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50Ojppc1NhZmVU b0xvYWRVUkwoYwogICAgIGlmICghZnJhbWUgfHwgIWRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2lu KCktPmNhbkRpc3BsYXkodXJsKSkgewogICAgICAgICBpZiAoYWN0aW9uSWZJbnZhbGlkID09IENv bXBsYWluKQogICAgICAgICAgICAgRnJhbWVMb2FkZXI6OnJlcG9ydExvY2FsTG9hZEZhaWxlZChm cmFtZSwgdXJsLnN0cmluZygpKTsKLSAgICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVu dDo6aXNTYWZlVG9Mb2FkVVJMKCVzKSAtPiBGQUxTRSByZWplY3RlZCBieSBTZWN1cml0eU9yaWdp biIsIHVybEZvckxvZ2dpbmcodXJsKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgTE9HKE1lZGlh LCAiSFRNTE1lZGlhRWxlbWVudDo6aXNTYWZlVG9Mb2FkVVJMKCVzKSAtPiBGQUxTRSByZWplY3Rl ZCBieSBTZWN1cml0eU9yaWdpbiIsIHVybEZvckxvZ2dpbmdNZWRpYSh1cmwpLnV0ZjgoKS5kYXRh KCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgaWYgKCFkb2N1bWVudCgp LT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dNZWRpYUZyb21Tb3VyY2UodXJsKSkgewot ICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50Ojppc1NhZmVUb0xvYWRVUkwoJXMp IC0+IHJlamVjdGVkIGJ5IENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IiwgdXJsRm9yTG9nZ2luZyh1 cmwpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50 Ojppc1NhZmVUb0xvYWRVUkwoJXMpIC0+IHJlamVjdGVkIGJ5IENvbnRlbnQgU2VjdXJpdHkgUG9s aWN5IiwgdXJsRm9yTG9nZ2luZ01lZGlhKHVybCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTI4NTQsNyArMjg1NCw3IEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6ZGlkUmVtb3ZlVHJhY2soSFQKICNpZiAhTE9HX0RJU0FCTEVECiAgICAgaWYgKHRy YWNrRWxlbWVudC0+aGFzVGFnTmFtZSh0cmFja1RhZykpIHsKICAgICAgICAgS1VSTCB1cmwgPSB0 cmFja0VsZW1lbnQtPmdldE5vbkVtcHR5VVJMQXR0cmlidXRlKHNyY0F0dHIpOwotICAgICAgICBM T0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpkaWRSZW1vdmVUcmFjayAtICdzcmMnIGlzICVz IiwgdXJsRm9yTG9nZ2luZyh1cmwpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBMT0coTWVkaWEs ICJIVE1MTWVkaWFFbGVtZW50OjpkaWRSZW1vdmVUcmFjayAtICdzcmMnIGlzICVzIiwgdXJsRm9y TG9nZ2luZ01lZGlhKHVybCkudXRmOCgpLmRhdGEoKSk7CiAgICAgfQogI2VuZGlmCiAKQEAgLTMx NDUsNyArMzE0NSw3IEBAIEtVUkwgSFRNTE1lZGlhRWxlbWVudDo6c2VsZWN0TmV4dFNvdXJjZUMK ICAgICAgICAgbWVkaWFVUkwgPSBzb3VyY2UtPmdldE5vbkVtcHR5VVJMQXR0cmlidXRlKHNyY0F0 dHIpOwogI2lmICFMT0dfRElTQUJMRUQKICAgICAgICAgaWYgKHNob3VsZExvZykKLSAgICAgICAg ICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE5leHRTb3VyY2VDaGlsZCAt ICdzcmMnIGlzICVzIiwgdXJsRm9yTG9nZ2luZyhtZWRpYVVSTCkudXRmOCgpLmRhdGEoKSk7Cisg ICAgICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3ROZXh0U291cmNl Q2hpbGQgLSAnc3JjJyBpcyAlcyIsIHVybEZvckxvZ2dpbmdNZWRpYShtZWRpYVVSTCkudXRmOCgp LmRhdGEoKSk7CiAjZW5kaWYKICAgICAgICAgaWYgKG1lZGlhVVJMLmlzRW1wdHkoKSkKICAgICAg ICAgICAgIGdvdG8gY2hlY2tfYWdhaW47CkBAIC0zMjA5LDcgKzMyMDksNyBAQCBjaGVja19hZ2Fp bjoKIAogI2lmICFMT0dfRElTQUJMRUQKICAgICBpZiAoc2hvdWxkTG9nKQotICAgICAgICBMT0co TWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3ROZXh0U291cmNlQ2hpbGQgLT4gJXAsICVz IiwgbV9jdXJyZW50U291cmNlTm9kZS5nZXQoKSwgY2FuVXNlU291cmNlRWxlbWVudCA/IHVybEZv ckxvZ2dpbmcobWVkaWFVUkwpLnV0ZjgoKS5kYXRhKCkgOiAiIik7CisgICAgICAgIExPRyhNZWRp YSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE5leHRTb3VyY2VDaGlsZCAtPiAlcCwgJXMiLCBt X2N1cnJlbnRTb3VyY2VOb2RlLmdldCgpLCBjYW5Vc2VTb3VyY2VFbGVtZW50ID8gdXJsRm9yTG9n Z2luZ01lZGlhKG1lZGlhVVJMKS51dGY4KCkuZGF0YSgpIDogIiIpOwogI2VuZGlmCiAgICAgcmV0 dXJuIGNhblVzZVNvdXJjZUVsZW1lbnQgPyBtZWRpYVVSTCA6IEtVUkwoKTsKIH0KQEAgLTMyMjEs NyArMzIyMSw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c291cmNlV2FzQWRkZWQoSFQKICNp ZiAhTE9HX0RJU0FCTEVECiAgICAgaWYgKHNvdXJjZS0+aGFzVGFnTmFtZShzb3VyY2VUYWcpKSB7 CiAgICAgICAgIEtVUkwgdXJsID0gc291cmNlLT5nZXROb25FbXB0eVVSTEF0dHJpYnV0ZShzcmNB dHRyKTsKLSAgICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6c291cmNlV2FzQWRk ZWQgLSAnc3JjJyBpcyAlcyIsIHVybEZvckxvZ2dpbmcodXJsKS51dGY4KCkuZGF0YSgpKTsKKyAg ICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6c291cmNlV2FzQWRkZWQgLSAnc3Jj JyBpcyAlcyIsIHVybEZvckxvZ2dpbmdNZWRpYSh1cmwpLnV0ZjgoKS5kYXRhKCkpOwogICAgIH0K ICNlbmRpZgogICAgIApAQCAtMzI2OSw3ICszMjY5LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50 Ojpzb3VyY2VXYXNSZW1vdmVkKAogI2lmICFMT0dfRElTQUJMRUQKICAgICBpZiAoc291cmNlLT5o YXNUYWdOYW1lKHNvdXJjZVRhZykpIHsKICAgICAgICAgS1VSTCB1cmwgPSBzb3VyY2UtPmdldE5v bkVtcHR5VVJMQXR0cmlidXRlKHNyY0F0dHIpOwotICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVk aWFFbGVtZW50Ojpzb3VyY2VXYXNSZW1vdmVkIC0gJ3NyYycgaXMgJXMiLCB1cmxGb3JMb2dnaW5n KHVybCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1l bnQ6OnNvdXJjZVdhc1JlbW92ZWQgLSAnc3JjJyBpcyAlcyIsIHVybEZvckxvZ2dpbmdNZWRpYSh1 cmwpLnV0ZjgoKS5kYXRhKCkpOwogICAgIH0KICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxUcmFja0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFRyYWNrRWxlbWVudC5jcHAJKHJldmlzaW9uIDEzNzAwMCkKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFRyYWNrRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDE1 ICszNiwxNSBAQAogI2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRl ICJTY3JpcHRDYWxsU3RhY2suaCIKICNpbmNsdWRlICJTY3JpcHRFdmVudExpc3RlbmVyLmgiCi0K IHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBu YW1lc3BhY2UgSFRNTE5hbWVzOwogCiAjaWYgIUxPR19ESVNBQkxFRAotc3RhdGljIFN0cmluZyB1 cmxGb3JMb2dnaW5nKGNvbnN0IEtVUkwmIHVybCkKK3N0YXRpYyBTdHJpbmcgdXJsRm9yTG9nZ2lu Z1RyYWNrKGNvbnN0IEtVUkwmIHVybCkKIHsKICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgbWF4 aW11bVVSTExlbmd0aEZvckxvZ2dpbmcgPSAxMjg7CiAgICAgCkBAIC0yMzEsNyArMjMxLDcgQEAg Ym9vbCBIVE1MVHJhY2tFbGVtZW50OjpjYW5Mb2FkVXJsKGNvbnN0CiAgICAgaWYgKCFkb2N1bWVu dCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dNZWRpYUZyb21Tb3VyY2UodXJsKSkg ewogICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgY29uc29sZU1lc3NhZ2UsIChB U0NJSUxpdGVyYWwoIlRleHQgdHJhY2sgbG9hZCBkZW5pZWQgYnkgQ29udGVudCBTZWN1cml0eSBQ b2xpY3kuIikpKTsKICAgICAgICAgZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoSlNNZXNz YWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGNvbnNvbGVNZXNz YWdlKTsKLSAgICAgICAgTE9HKE1lZGlhLCAiSFRNTFRyYWNrRWxlbWVudDo6Y2FuTG9hZFVybCgl cykgLT4gcmVqZWN0ZWQgYnkgQ29udGVudCBTZWN1cml0eSBQb2xpY3kiLCB1cmxGb3JMb2dnaW5n KHVybCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIExPRyhNZWRpYSwgIkhUTUxUcmFja0VsZW1l bnQ6OmNhbkxvYWRVcmwoJXMpIC0+IHJlamVjdGVkIGJ5IENvbnRlbnQgU2VjdXJpdHkgUG9saWN5 IiwgdXJsRm9yTG9nZ2luZ1RyYWNrKHVybCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9CiAgICAgCg==