92341 2012-07-25 23:50:06 -0700 Add message traces when media and plugins load or fail to load. 2012-07-26 12:01:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92336 92340 1 jer.noble jer.noble dglazkov eric.carlson feature-media-reviews gustavo philn webkit.review.bot xan.lopez oldest_to_newest 678926 0 jer.noble 2012-07-25 23:50:06 -0700 Add message traces when media and plugins load or fail to load. 678945 1 154561 jer.noble 2012-07-26 00:12:36 -0700 Created attachment 154561 Patch 678965 2 154561 webkit-ews 2012-07-26 00:43:57 -0700 Comment on attachment 154561 Patch Attachment 154561 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/13351563 678966 3 154561 webkit.review.bot 2012-07-26 00:44:55 -0700 Comment on attachment 154561 Patch Attachment 154561 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13351556 678970 4 154561 webkit-ews 2012-07-26 00:49:06 -0700 Comment on attachment 154561 Patch Attachment 154561 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13361409 678976 5 154561 gyuyoung.kim 2012-07-26 01:00:48 -0700 Comment on attachment 154561 Patch Attachment 154561 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13342624 679025 6 154561 gustavo 2012-07-26 01:33:20 -0700 Comment on attachment 154561 Patch Attachment 154561 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/13351583 679221 7 154561 eric.carlson 2012-07-26 05:52:57 -0700 Comment on attachment 154561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154561&action=review > Source/WebCore/html/HTMLMediaElement.cpp:1520 > + default: return emptyString(); Shouldn't this have ASSERT_NOT_REACHED? > Source/WebCore/html/HTMLMediaElement.cpp:1701 > scheduleEvent(eventNames().loadeddataEvent); > setShouldDelayLoadEvent(false); > + if (document()->page() && document()->page()->settings()->messageTracingEnabled()) > + document()->page()->chrome()->client()->traceMessage(ChromeClient::MediaLoaded, m_player->engineDescription()); I think it would be better to do this when we reach HAVE_METADATA, or an element with "preload=metadata" may not ever notify the client even thought it found and loaded part of a valid media file. 679346 8 jer.noble 2012-07-26 08:06:38 -0700 (In reply to comment #7) > (From update of attachment 154561 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154561&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:1520 > > + default: return emptyString(); > > Shouldn't this have ASSERT_NOT_REACHED? Sure. > > Source/WebCore/html/HTMLMediaElement.cpp:1701 > > scheduleEvent(eventNames().loadeddataEvent); > > setShouldDelayLoadEvent(false); > > + if (document()->page() && document()->page()->settings()->messageTracingEnabled()) > > + document()->page()->chrome()->client()->traceMessage(ChromeClient::MediaLoaded, m_player->engineDescription()); > > I think it would be better to do this when we reach HAVE_METADATA, or an element with "preload=metadata" may not ever notify the client even thought it found and loaded part of a valid media file. Is HAVE_METADATA guaranteed to only fire once? (It looks like we will never drop down below HAVE_METADATA unless the user cancels load. So yes.) 679517 9 154688 jer.noble 2012-07-26 10:57:15 -0700 Created attachment 154688 Patch 679535 10 154688 webkit.review.bot 2012-07-26 11:13:23 -0700 Comment on attachment 154688 Patch Attachment 154688 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13351831 679538 11 154688 webkit-ews 2012-07-26 11:13:58 -0700 Comment on attachment 154688 Patch Attachment 154688 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/13345862 679545 12 154688 webkit-ews 2012-07-26 11:18:47 -0700 Comment on attachment 154688 Patch Attachment 154688 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13342893 679555 13 154688 gyuyoung.kim 2012-07-26 11:22:43 -0700 Comment on attachment 154688 Patch Attachment 154688 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13340887 679627 14 jer.noble 2012-07-26 12:01:40 -0700 Committed r123780: <http://trac.webkit.org/changeset/123780> 154561 2012-07-26 00:12:36 -0700 2012-07-26 10:57:12 -0700 Patch bug-92341-20120726001225.patch text/plain 6055 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVmOTcyMzc0YjliYmJh MjM0NGM2N2Q4ZDUzYzA4ZDQ0ZjRhNGQxOS4uYjMwMWQyZmI4Mzg1MDZlNmQ0ZjRhZjFhOWY2ZmE3 MTExZWJiNGJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA3LTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIEFkZCBtZXNzYWdlIHRyYWNl cyB3aGVuIG1lZGlhIGFuZCBwbHVnaW5zIGxvYWQgb3IgZmFpbCB0byBsb2FkLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTIzNDEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZW5kIG1lc3NhZ2UgdHJhY2Vz IHdoZW4gYSBtZWRpYSBvciBwbHVnaW4gZWxlbWVudCBsb2FkcyBvciBmYWlscyB0byBsb2FkLiBJ bmNsdWRlIGluCisgICAgICAgIHRoZSB0cmFjZSB0aGUgbWVkaWEgZW5naW5lIGRlc2NyaXB0aW9u LCBlcnJvciBjb2RlLCBvciBwbHVnaW4gbWltZSB0eXBlLgorCisgICAgICAgICogaHRtbC9IVE1M RW1iZWRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbWJlZEVsZW1lbnQ6OnVw ZGF0ZVdpZGdldCk6IFNlbmQgYSBtZXNzYWdlIHRyYWNlLgorICAgICAgICAqIGh0bWwvSFRNTE1l ZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdHJpbmdGb3JOZXR3b3JrU3RhdGUp OiBBZGRlZCBjb252ZW5pZW5jZSBmdW5jdGlvbiB0byBzdHJpbmdpZnkgbmV0d29yayBzdGF0ZXMu CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYUxvYWRpbmdGYWlsZWQp OiBTZW5kIGEgbWVzc2FnZSB0cmFjZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6OnNldFJlYWR5U3RhdGUpOiBTZW5kIGEgbWVzc2FnZSB0cmFjZS4KKyAgICAgICAgKiBodG1s L0hUTUxPYmplY3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPYmplY3RFbGVt ZW50Ojp1cGRhdGVXaWRnZXQpOiBTZW5kIGEgbWVzc2FnZSB0cmFjZS4KKworMjAxMi0wNy0yNSAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgYSBDaHJvbWVD bGllbnQgbWV0aG9kIHRvIHNlbmQgbWVzc2FnZSB0cmFjZXMgZnJvbSBXZWJDb3JlIHRvIHRoZSBj bGllbnQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 MjM0MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcAppbmRleCAxNWUz MmVlZjcwNDI4OWEwMWNlNTg5YTJmODcyMjlkNTRiY2Y3NTlmLi4zYmJmNTU2NWIxM2VmMGUyOTcx MDhhZmZjNTY0OTM3ZTFjZjQ5NWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxFbWJlZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxl bWVudC5jcHAKQEAgLTI2LDYgKzI2LDggQEAKIAogI2luY2x1ZGUgIkF0dHJpYnV0ZS5oIgogI2lu Y2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIKKyNpbmNsdWRlICJDaHJvbWUuaCIKKyNpbmNsdWRl ICJDaHJvbWVDbGllbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgogI2luY2x1ZGUg IkZyYW1lLmgiCiAjaW5jbHVkZSAiSFRNTERvY3VtZW50LmgiCkBAIC0zNCw2ICszNiw3IEBACiAj aW5jbHVkZSAiSFRNTE9iamVjdEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MUGFyc2VySWRpb21z LmgiCiAjaW5jbHVkZSAiTWFpblJlc291cmNlTG9hZGVyLmgiCisjaW5jbHVkZSAiUGFnZS5oIgog I2luY2x1ZGUgIlBsdWdpbkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiUmVuZGVyRW1iZWRkZWRPYmpl Y3QuaCIKICNpbmNsdWRlICJSZW5kZXJJbWFnZS5oIgpAQCAtMTcyLDcgKzE3NSwxMCBAQCB2b2lk IEhUTUxFbWJlZEVsZW1lbnQ6OnVwZGF0ZVdpZGdldChQbHVnaW5DcmVhdGlvbk9wdGlvbiBwbHVn aW5DcmVhdGlvbk9wdGlvbikKIAogICAgIFN1YmZyYW1lTG9hZGVyKiBsb2FkZXIgPSBkb2N1bWVu dCgpLT5mcmFtZSgpLT5sb2FkZXIoKS0+c3ViZnJhbWVMb2FkZXIoKTsKICAgICAvLyBGSVhNRTog YmVmb3JlTG9hZCBjb3VsZCBoYXZlIGRldGFjaGVkIHRoZSByZW5kZXJlciEgIEp1c3QgbGlrZSBp biB0aGUgPG9iamVjdD4gY2FzZSBhYm92ZS4KLSAgICBsb2FkZXItPnJlcXVlc3RPYmplY3QodGhp cywgbV91cmwsIGdldE5hbWVBdHRyaWJ1dGUoKSwgbV9zZXJ2aWNlVHlwZSwgcGFyYW1OYW1lcywg cGFyYW1WYWx1ZXMpOworICAgIGJvb2wgc3VjY2VzcyA9IGxvYWRlci0+cmVxdWVzdE9iamVjdCh0 aGlzLCBtX3VybCwgZ2V0TmFtZUF0dHJpYnV0ZSgpLCBtX3NlcnZpY2VUeXBlLCBwYXJhbU5hbWVz LCBwYXJhbVZhbHVlcyk7CisKKyAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpICYmIGRvY3VtZW50 KCktPnBhZ2UoKS0+c2V0dGluZ3MoKS0+bWVzc2FnZVRyYWNpbmdFbmFibGVkKCkpCisgICAgICAg IGRvY3VtZW50KCktPnBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT50cmFjZU1lc3NhZ2Uoc3Vj Y2VzcyA/IENocm9tZUNsaWVudDo6UGx1Z2luTG9hZGVkIDogQ2hyb21lQ2xpZW50OjpQbHVnaW5M b2FkaW5nRmFpbGVkLCBtX3NlcnZpY2VUeXBlKTsKIH0KIAogYm9vbCBIVE1MRW1iZWRFbGVtZW50 OjpyZW5kZXJlcklzTmVlZGVkKGNvbnN0IE5vZGVSZW5kZXJpbmdDb250ZXh0JiBjb250ZXh0KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggZTkzYjg1Nzg5MDgz OTZhODhkOTAyYzM0MzViMjAwYzJmMmFkYWZjNC4uYzExNDRjMzg2ZDg2ZGY2MmQ3MmZjMDg2ZGVm NjYyZGZmODRhNjU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw CkBAIC0xNTA3LDYgKzE1MDcsMjAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXll ck5ldHdvcmtTdGF0ZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKQogICAgIGVuZFByb2Nlc3NpbmdNZWRp YVBsYXllckNhbGxiYWNrKCk7CiB9CiAKK3N0YXRpYyBTdHJpbmcgc3RyaW5nRm9yTmV0d29ya1N0 YXRlKE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgc3RhdGUpCit7CisgICAgc3dpdGNoIChzdGF0 ZSkgeworICAgIGNhc2UgTWVkaWFQbGF5ZXI6OkVtcHR5OiByZXR1cm4gIkVtcHR5IjsKKyAgICBj YXNlIE1lZGlhUGxheWVyOjpJZGxlOiByZXR1cm4gIklkbGUiOworICAgIGNhc2UgTWVkaWFQbGF5 ZXI6OkxvYWRpbmc6IHJldHVybiAiTG9hZGluZyI7CisgICAgY2FzZSBNZWRpYVBsYXllcjo6TG9h ZGVkOiByZXR1cm4gIkxvYWRlZCI7CisgICAgY2FzZSBNZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3I6 IHJldHVybiAiRm9ybWF0RXJyb3IiOworICAgIGNhc2UgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtFcnJv cjogcmV0dXJuICJOZXR3b3JrRXJyb3IiOworICAgIGNhc2UgTWVkaWFQbGF5ZXI6OkRlY29kZUVy cm9yOiByZXR1cm4gIkRlY29kZUVycm9yIjsKKyAgICBkZWZhdWx0OiByZXR1cm4gZW1wdHlTdHJp bmcoKTsKKyAgICB9Cit9CisKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFMb2FkaW5nRmFp bGVkKE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgZXJyb3IpCiB7CiAgICAgc3RvcFBlcmlvZGlj VGltZXJzKCk7CkBAIC0xNTQzLDYgKzE1NTcsOSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1l ZGlhTG9hZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIGVycm9yKQogICAgICAg ICBtZWRpYUNvbnRyb2xzKCktPnJlc2V0KCk7CiAgICAgICAgIG1lZGlhQ29udHJvbHMoKS0+cmVw b3J0ZWRFcnJvcigpOwogICAgIH0KKworICAgIGlmIChkb2N1bWVudCgpLT5wYWdlKCkgJiYgZG9j dW1lbnQoKS0+cGFnZSgpLT5zZXR0aW5ncygpLT5tZXNzYWdlVHJhY2luZ0VuYWJsZWQoKSkKKyAg ICAgICAgZG9jdW1lbnQoKS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPnRyYWNlTWVzc2Fn ZShDaHJvbWVDbGllbnQ6Ok1lZGlhTG9hZGluZ0ZhaWxlZCwgc3RyaW5nRm9yTmV0d29ya1N0YXRl KGVycm9yKSk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0TmV0d29ya1N0YXRlKE1l ZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgc3RhdGUpCkBAIC0xNjgwLDYgKzE2OTcsOCBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnNldFJlYWR5U3RhdGUoTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGUg c3RhdGUpCiAgICAgICAgIHNob3VsZFVwZGF0ZURpc3BsYXlTdGF0ZSA9IHRydWU7CiAgICAgICAg IHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLmxvYWRlZGRhdGFFdmVudCk7CiAgICAgICAgIHNl dFNob3VsZERlbGF5TG9hZEV2ZW50KGZhbHNlKTsKKyAgICAgICAgaWYgKGRvY3VtZW50KCktPnBh Z2UoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCktPm1lc3NhZ2VUcmFjaW5nRW5h YmxlZCgpKQorICAgICAgICAgICAgZG9jdW1lbnQoKS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50 KCktPnRyYWNlTWVzc2FnZShDaHJvbWVDbGllbnQ6Ok1lZGlhTG9hZGVkLCBtX3BsYXllci0+ZW5n aW5lRGVzY3JpcHRpb24oKSk7CiAgICAgICAgIGFwcGx5TWVkaWFGcmFnbWVudFVSSSgpOwogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAppbmRleCBmNzJi ZTBmODFlMmYwZTZkYmE5YzY0ODEzNmMyNDI2NjdkMmYzOTRlLi4xNDcwYWQ0MjIxYjZmYjhmY2Mx ZmM4ZDkxNjBmYjk3NzIwNTNlMDI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxPYmplY3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RF bGVtZW50LmNwcApAQCAtMjYsNiArMjYsOCBAQAogCiAjaW5jbHVkZSAiQXR0cmlidXRlLmgiCiAj aW5jbHVkZSAiQ1NTVmFsdWVLZXl3b3Jkcy5oIgorI2luY2x1ZGUgIkNocm9tZS5oIgorI2luY2x1 ZGUgIkNocm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKICNpbmNsdWRlICJF eGNlcHRpb25Db2RlLmgiCiAjaW5jbHVkZSAiRm9ybURhdGFMaXN0LmgiCkBAIC0zMTYsNiArMzE4 LDkgQEAgdm9pZCBIVE1MT2JqZWN0RWxlbWVudDo6dXBkYXRlV2lkZ2V0KFBsdWdpbkNyZWF0aW9u T3B0aW9uIHBsdWdpbkNyZWF0aW9uT3B0aW9uKQogICAgIGJvb2wgc3VjY2VzcyA9IGJlZm9yZUxv YWRBbGxvd2VkTG9hZCAmJiBoYXNWYWxpZENsYXNzSWQoKSAmJiBsb2FkZXItPnJlcXVlc3RPYmpl Y3QodGhpcywgdXJsLCBnZXROYW1lQXR0cmlidXRlKCksIHNlcnZpY2VUeXBlLCBwYXJhbU5hbWVz LCBwYXJhbVZhbHVlcyk7CiAgICAgaWYgKCFzdWNjZXNzICYmIGZhbGxiYWNrQ29udGVudCkKICAg ICAgICAgcmVuZGVyRmFsbGJhY2tDb250ZW50KCk7CisKKyAgICBpZiAoZG9jdW1lbnQoKS0+cGFn ZSgpICYmIGRvY3VtZW50KCktPnBhZ2UoKS0+c2V0dGluZ3MoKS0+bWVzc2FnZVRyYWNpbmdFbmFi bGVkKCkpCisgICAgICAgIGRvY3VtZW50KCktPnBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT50 cmFjZU1lc3NhZ2Uoc3VjY2VzcyA/IENocm9tZUNsaWVudDo6UGx1Z2luTG9hZGVkIDogQ2hyb21l Q2xpZW50OjpQbHVnaW5Mb2FkaW5nRmFpbGVkLCBzZXJ2aWNlVHlwZSk7CiB9CiAKIGJvb2wgSFRN TE9iamVjdEVsZW1lbnQ6OnJlbmRlcmVySXNOZWVkZWQoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRl eHQmIGNvbnRleHQpCg== 154688 2012-07-26 10:57:15 -0700 2012-07-26 11:22:43 -0700 Patch bug-92341-20120726105704.patch text/plain 6647 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmE0ZTA1ZGExMTQ0Nzg3 ZDMzMmNkN2FmYzEzNDZlNTM0YjA5ZDAzZC4uNWUxYzUxMWZmM2Q3MzA4NzY2NDMxZWVjOTc2MTVh Yjg1Yjc3MTE3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA3LTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIEFkZCBkaWFnbm9zdGljIG1l c3NhZ2VzIHdoZW4gbWVkaWEgYW5kIHBsdWdpbnMgbG9hZCBvciBmYWlsIHRvIGxvYWQuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjM0MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlbmQgZGlhZ25vc3Rp YyBtZXNzYWdlcyB3aGVuIGEgbWVkaWEgb3IgcGx1Z2luIGVsZW1lbnQgbG9hZHMgb3IgZmFpbHMg dG8gbG9hZC4gSW5jbHVkZSBpbgorICAgICAgICB0aGUgdHJhY2UgdGhlIG1lZGlhIGVuZ2luZSBk ZXNjcmlwdGlvbiwgZXJyb3IgY29kZSwgb3IgcGx1Z2luIG1pbWUgdHlwZS4KKworICAgICAgICAq IGh0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRW1iZWRF bGVtZW50Ojp1cGRhdGVXaWRnZXQpOiBTZW5kIGEgZGlhZ25vc3RpYyBtZXNzYWdlLgorICAgICAg ICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdHJpbmdG b3JOZXR3b3JrU3RhdGUpOiBBZGRlZCBjb252ZW5pZW5jZSBmdW5jdGlvbiB0byBzdHJpbmdpZnkg bmV0d29yayBzdGF0ZXMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRp YUxvYWRpbmdGYWlsZWQpOiBTZW5kIGEgZGlhZ25vc3RpYyBtZXNzYWdlLgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0UmVhZHlTdGF0ZSk6IFNlbmQgYSBkaWFnbm9zdGlj IG1lc3NhZ2UuCisgICAgICAgICogaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MT2JqZWN0RWxlbWVudDo6dXBkYXRlV2lkZ2V0KTogU2VuZCBhIGRpYWdu b3N0aWMgbWVzc2FnZS4KKworMjAxMi0wNy0yNSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxl LmNvbT4KKwogICAgICAgICBBZGQgYSBDaHJvbWVDbGllbnQgbWV0aG9kIHRvIHNlbmQgZGlhZ25v c3RpYyBsb2dnaW5nIG1lc3NhZ2VzIGZyb20gV2ViQ29yZSB0byB0aGUgY2xpZW50LgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTIzNDAKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAKaW5kZXggMTVlMzJlZWY3MDQyODlhMDFj ZTU4OWEyZjg3MjI5ZDU0YmNmNzU5Zi4uYmFmODhjZjg1OGViNTUxNWUwZTk3MjU3ZjZhYWMyNTkx MzY4M2M4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwCkBAIC0y Niw2ICsyNiw5IEBACiAKICNpbmNsdWRlICJBdHRyaWJ1dGUuaCIKICNpbmNsdWRlICJDU1NQcm9w ZXJ0eU5hbWVzLmgiCisjaW5jbHVkZSAiQ2hyb21lLmgiCisjaW5jbHVkZSAiQ2hyb21lQ2xpZW50 LmgiCisjaW5jbHVkZSAiRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmgiCiAjaW5jbHVkZSAiRG9jdW1l bnRMb2FkZXIuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudC5o IgpAQCAtMzQsNiArMzcsNyBAQAogI2luY2x1ZGUgIkhUTUxPYmplY3RFbGVtZW50LmgiCiAjaW5j bHVkZSAiSFRNTFBhcnNlcklkaW9tcy5oIgogI2luY2x1ZGUgIk1haW5SZXNvdXJjZUxvYWRlci5o IgorI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQbHVnaW5Eb2N1bWVudC5oIgogI2luY2x1 ZGUgIlJlbmRlckVtYmVkZGVkT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKQEAg LTE3Miw3ICsxNzYsMTAgQEAgdm9pZCBIVE1MRW1iZWRFbGVtZW50Ojp1cGRhdGVXaWRnZXQoUGx1 Z2luQ3JlYXRpb25PcHRpb24gcGx1Z2luQ3JlYXRpb25PcHRpb24pCiAKICAgICBTdWJmcmFtZUxv YWRlciogbG9hZGVyID0gZG9jdW1lbnQoKS0+ZnJhbWUoKS0+bG9hZGVyKCktPnN1YmZyYW1lTG9h ZGVyKCk7CiAgICAgLy8gRklYTUU6IGJlZm9yZUxvYWQgY291bGQgaGF2ZSBkZXRhY2hlZCB0aGUg cmVuZGVyZXIhICBKdXN0IGxpa2UgaW4gdGhlIDxvYmplY3Q+IGNhc2UgYWJvdmUuCi0gICAgbG9h ZGVyLT5yZXF1ZXN0T2JqZWN0KHRoaXMsIG1fdXJsLCBnZXROYW1lQXR0cmlidXRlKCksIG1fc2Vy dmljZVR5cGUsIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzKTsKKyAgICBib29sIHN1Y2Nlc3MgPSBs b2FkZXItPnJlcXVlc3RPYmplY3QodGhpcywgbV91cmwsIGdldE5hbWVBdHRyaWJ1dGUoKSwgbV9z ZXJ2aWNlVHlwZSwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMpOworCisgICAgaWYgKGRvY3VtZW50 KCktPnBhZ2UoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCktPmRpYWdub3N0aWNM b2dnaW5nRW5hYmxlZCgpKQorICAgICAgICBkb2N1bWVudCgpLT5wYWdlKCktPmNocm9tZSgpLT5j bGllbnQoKS0+bG9nRGlhZ25vc3RpY01lc3NhZ2Uoc3VjY2VzcyA/IERpYWdub3N0aWNMb2dnaW5n S2V5czo6cGx1Z2luTG9hZGVkS2V5KCkgOiBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBsdWdpbkxv YWRpbmdGYWlsZWRLZXkoKSwgbV9zZXJ2aWNlVHlwZSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpu b29wS2V5KCkpOwogfQogCiBib29sIEhUTUxFbWJlZEVsZW1lbnQ6OnJlbmRlcmVySXNOZWVkZWQo Y29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmIGNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBlOTNiODU3ODkwODM5NmE4OGQ5MDJjMzQzNWIyMDBj MmYyYWRhZmM0Li5jYzAyNWMxMmI1YTgzYTE2ZDZiNTc1ZTRkN2VkNTI1YWM0MWE4MTk4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTM5LDYgKzM5LDcgQEAK ICNpbmNsdWRlICJDb250ZW50VHlwZS5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIK ICNpbmNsdWRlICJDU1NWYWx1ZUtleXdvcmRzLmgiCisjaW5jbHVkZSAiRGlhZ25vc3RpY0xvZ2dp bmdLZXlzLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKICNpbmNsdWRlICJFbGVtZW50 U2hhZG93LmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKQEAgLTE1MDcsNiArMTUwOCwyMCBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyTmV0d29ya1N0YXRlQ2hhbmdlZChNZWRpYVBs YXllciopCiAgICAgZW5kUHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKIH0KIAorc3Rh dGljIFN0cmluZyBzdHJpbmdGb3JOZXR3b3JrU3RhdGUoTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0 ZSBzdGF0ZSkKK3sKKyAgICBzd2l0Y2ggKHN0YXRlKSB7CisgICAgY2FzZSBNZWRpYVBsYXllcjo6 RW1wdHk6IHJldHVybiAiRW1wdHkiOworICAgIGNhc2UgTWVkaWFQbGF5ZXI6OklkbGU6IHJldHVy biAiSWRsZSI7CisgICAgY2FzZSBNZWRpYVBsYXllcjo6TG9hZGluZzogcmV0dXJuICJMb2FkaW5n IjsKKyAgICBjYXNlIE1lZGlhUGxheWVyOjpMb2FkZWQ6IHJldHVybiAiTG9hZGVkIjsKKyAgICBj YXNlIE1lZGlhUGxheWVyOjpGb3JtYXRFcnJvcjogcmV0dXJuICJGb3JtYXRFcnJvciI7CisgICAg Y2FzZSBNZWRpYVBsYXllcjo6TmV0d29ya0Vycm9yOiByZXR1cm4gIk5ldHdvcmtFcnJvciI7Cisg ICAgY2FzZSBNZWRpYVBsYXllcjo6RGVjb2RlRXJyb3I6IHJldHVybiAiRGVjb2RlRXJyb3IiOwor ICAgIGRlZmF1bHQ6IHJldHVybiBlbXB0eVN0cmluZygpOworICAgIH0KK30KKwogdm9pZCBIVE1M TWVkaWFFbGVtZW50OjptZWRpYUxvYWRpbmdGYWlsZWQoTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0 ZSBlcnJvcikKIHsKICAgICBzdG9wUGVyaW9kaWNUaW1lcnMoKTsKQEAgLTE1NDMsNiArMTU1OCw5 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFMb2FkaW5nRmFpbGVkKE1lZGlhUGxheWVy OjpOZXR3b3JrU3RhdGUgZXJyb3IpCiAgICAgICAgIG1lZGlhQ29udHJvbHMoKS0+cmVzZXQoKTsK ICAgICAgICAgbWVkaWFDb250cm9scygpLT5yZXBvcnRlZEVycm9yKCk7CiAgICAgfQorCisgICAg aWYgKGRvY3VtZW50KCktPnBhZ2UoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCkt PmRpYWdub3N0aWNMb2dnaW5nRW5hYmxlZCgpKQorICAgICAgICBkb2N1bWVudCgpLT5wYWdlKCkt PmNocm9tZSgpLT5jbGllbnQoKS0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dp bmdLZXlzOjptZWRpYUxvYWRpbmdGYWlsZWRLZXkoKSwgc3RyaW5nRm9yTmV0d29ya1N0YXRlKGVy cm9yKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpmYWlsS2V5KCkpOwogfQogCiB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OnNldE5ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIHN0 YXRlKQpAQCAtMTY3MSw2ICsxNjg5LDkgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRSZWFk eVN0YXRlKE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIHN0YXRlKQogICAgICAgICAgICAgbWVkaWFD b250cm9scygpLT5sb2FkZWRNZXRhZGF0YSgpOwogICAgICAgICBpZiAocmVuZGVyZXIoKSkKICAg ICAgICAgICAgIHJlbmRlcmVyKCktPnVwZGF0ZUZyb21FbGVtZW50KCk7CisKKyAgICAgICAgaWYg KGRvY3VtZW50KCktPnBhZ2UoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCktPmRp YWdub3N0aWNMb2dnaW5nRW5hYmxlZCgpKQorICAgICAgICAgICAgZG9jdW1lbnQoKS0+cGFnZSgp LT5jaHJvbWUoKS0+Y2xpZW50KCktPmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dn aW5nS2V5czo6bWVkaWFMb2FkZWRLZXkoKSwgbV9wbGF5ZXItPmVuZ2luZURlc2NyaXB0aW9uKCks IERpYWdub3N0aWNMb2dnaW5nS2V5czo6bm9vcEtleSgpKTsKICAgICB9CiAKICAgICBib29sIHNo b3VsZFVwZGF0ZURpc3BsYXlTdGF0ZSA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxP YmplY3RFbGVtZW50LmNwcAppbmRleCBmNzJiZTBmODFlMmYwZTZkYmE5YzY0ODEzNmMyNDI2Njdk MmYzOTRlLi44NDViMTM0OGEyOGQ3MGIxMTE1MjhmMTA3NjUyNDU4YTQ4MTA3NjM3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcApAQCAtMjYsNiArMjYsOSBAQAog CiAjaW5jbHVkZSAiQXR0cmlidXRlLmgiCiAjaW5jbHVkZSAiQ1NTVmFsdWVLZXl3b3Jkcy5oIgor I2luY2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIkNocm9tZUNsaWVudC5oIgorI2luY2x1ZGUg IkRpYWdub3N0aWNMb2dnaW5nS2V5cy5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKICNpbmNs dWRlICJFeGNlcHRpb25Db2RlLmgiCiAjaW5jbHVkZSAiRm9ybURhdGFMaXN0LmgiCkBAIC0zMTYs NiArMzE5LDkgQEAgdm9pZCBIVE1MT2JqZWN0RWxlbWVudDo6dXBkYXRlV2lkZ2V0KFBsdWdpbkNy ZWF0aW9uT3B0aW9uIHBsdWdpbkNyZWF0aW9uT3B0aW9uKQogICAgIGJvb2wgc3VjY2VzcyA9IGJl Zm9yZUxvYWRBbGxvd2VkTG9hZCAmJiBoYXNWYWxpZENsYXNzSWQoKSAmJiBsb2FkZXItPnJlcXVl c3RPYmplY3QodGhpcywgdXJsLCBnZXROYW1lQXR0cmlidXRlKCksIHNlcnZpY2VUeXBlLCBwYXJh bU5hbWVzLCBwYXJhbVZhbHVlcyk7CiAgICAgaWYgKCFzdWNjZXNzICYmIGZhbGxiYWNrQ29udGVu dCkKICAgICAgICAgcmVuZGVyRmFsbGJhY2tDb250ZW50KCk7CisKKyAgICBpZiAoZG9jdW1lbnQo KS0+cGFnZSgpICYmIGRvY3VtZW50KCktPnBhZ2UoKS0+c2V0dGluZ3MoKS0+ZGlhZ25vc3RpY0xv Z2dpbmdFbmFibGVkKCkpCisgICAgICAgIGRvY3VtZW50KCktPnBhZ2UoKS0+Y2hyb21lKCktPmNs aWVudCgpLT5sb2dEaWFnbm9zdGljTWVzc2FnZShzdWNjZXNzID8gRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjpwbHVnaW5Mb2FkZWRLZXkoKSA6IERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGx1Z2luTG9h ZGluZ0ZhaWxlZEtleSgpLCBzZXJ2aWNlVHlwZSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub29w S2V5KCkpOwogfQogCiBib29sIEhUTUxPYmplY3RFbGVtZW50OjpyZW5kZXJlcklzTmVlZGVkKGNv bnN0IE5vZGVSZW5kZXJpbmdDb250ZXh0JiBjb250ZXh0KQo=