185479 2018-05-09 11:09:44 -0700 [GStreamer] Fix style issue in MediaPlayerPrivateGStreamer 2018-05-09 12:03:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 tsaunier webkit-unassigned commit-queue pnormand tsaunier webkit-bug-importer oldest_to_newest 1422355 0 tsaunier 2018-05-09 11:09:44 -0700 Several fixable issue happen when running check-webkit-style explicitely against the file. 1422363 1 339990 tsaunier 2018-05-09 11:17:31 -0700 Created attachment 339990 [GStreamer] Fix style issue in MediaPlayerPrivateGStreamer ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:114: Multi line control clauses should use braces. [whitespace/braces] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:194: Multi line control clauses should use braces. [whitespace/braces] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:398: One line control clauses should not use braces. [whitespace/braces] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:440: One line control clauses should not use braces. [whitespace/braces] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:806: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:869: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:880: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:940: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1102: Multi line control clauses should use braces. [whitespace/braces] [4] ERROR: Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1109: Multi line control clauses should use braces. [whitespace/braces] [4] 1422387 2 339990 commit-queue 2018-05-09 12:01:50 -0700 Comment on attachment 339990 [GStreamer] Fix style issue in MediaPlayerPrivateGStreamer Clearing flags on attachment: 339990 Committed r231581: <https://trac.webkit.org/changeset/231581> 1422388 3 commit-queue 2018-05-09 12:01:51 -0700 All reviewed patches have been landed. Closing bug. 1422390 4 webkit-bug-importer 2018-05-09 12:03:24 -0700 <rdar://problem/40101037> 339990 2018-05-09 11:17:31 -0700 2018-05-09 12:01:50 -0700 [GStreamer] Fix style issue in MediaPlayerPrivateGStreamer GStreamer-Fix-style-issue-in-MediaPlayerPrivateGSt.patch text/plain 11059 tsaunier RnJvbSA1ZmFkOWE3MzYzOGE5NGU4YjczNGIxYzM5NjE3ZGI2MmE4MWEwZThlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaGliYXVsdCBTYXVuaWVyIDx0c2F1bmllckBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDMgTWF5IDIwMTggMTI6MDU6MTQgKzAyMDAKU3ViamVjdDogW1BBVENIIHhz ZXJ2ZXJdIFtHU3RyZWFtZXJdIEZpeCBzdHlsZSBpc3N1ZSBpbgogTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyCgpFUlJPUjogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6MTE0OiAgTXVsdGkgbGluZSBjb250 cm9sIGNsYXVzZXMgc2hvdWxkIHVzZSBicmFjZXMuICBbd2hpdGVzcGFjZS9icmFjZXNdIFs0XQpF UlJPUjogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6MTk0OiAgTXVsdGkgbGluZSBjb250cm9sIGNsYXVzZXMg c2hvdWxkIHVzZSBicmFjZXMuICBbd2hpdGVzcGFjZS9icmFjZXNdIFs0XQpFUlJPUjogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHA6Mzk4OiAgT25lIGxpbmUgY29udHJvbCBjbGF1c2VzIHNob3VsZCBub3QgdXNl IGJyYWNlcy4gIFt3aGl0ZXNwYWNlL2JyYWNlc10gWzRdCkVSUk9SOiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNw cDo0NDA6ICBPbmUgbGluZSBjb250cm9sIGNsYXVzZXMgc2hvdWxkIG5vdCB1c2UgYnJhY2VzLiAg W3doaXRlc3BhY2UvYnJhY2VzXSBbNF0KRVJST1I6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOjgwNjogIE1v cmUgdGhhbiBvbmUgY29tbWFuZCBvbiB0aGUgc2FtZSBsaW5lICBbd2hpdGVzcGFjZS9uZXdsaW5l XSBbNF0KRVJST1I6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOjg2OTogIE1vcmUgdGhhbiBvbmUgY29tbWFu ZCBvbiB0aGUgc2FtZSBsaW5lICBbd2hpdGVzcGFjZS9uZXdsaW5lXSBbNF0KRVJST1I6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwOjg4MDogIE1vcmUgdGhhbiBvbmUgY29tbWFuZCBvbiB0aGUgc2FtZSBsaW5l ICBbd2hpdGVzcGFjZS9uZXdsaW5lXSBbNF0KRVJST1I6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOjk0MDog IE1vcmUgdGhhbiBvbmUgY29tbWFuZCBvbiB0aGUgc2FtZSBsaW5lICBbd2hpdGVzcGFjZS9uZXds aW5lXSBbNF0KRVJST1I6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOjExMDI6ICBNdWx0aSBsaW5lIGNvbnRy b2wgY2xhdXNlcyBzaG91bGQgdXNlIGJyYWNlcy4gIFt3aGl0ZXNwYWNlL2JyYWNlc10gWzRdCkVS Uk9SOiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoxMTA5OiAgTXVsdGkgbGluZSBjb250cm9sIGNsYXVzZXMg c2hvdWxkIHVzZSBicmFjZXMuICBbd2hpdGVzcGFjZS9icmFjZXNdIFs0XQoKaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTQ3OQotLS0KIFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICB8IDMyICsrKysrKysrKysrKysrKysKIC4uLi9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCB8IDM3ICsrKysrKysrKysr Ky0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDk4MDYzNGMxYTg4Li41YWVhMmRkMzI5NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM1IEBACisyMDE4LTA1LTA5ICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBGaXggc3R5bGUgaXNzdWUgaW4gTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODU0NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBFUlJPUjogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6MTE0OiAgTXVsdGkgbGlu ZSBjb250cm9sIGNsYXVzZXMgc2hvdWxkIHVzZSBicmFjZXMuICBbd2hpdGVzcGFjZS9icmFjZXNd IFs0XQorICAgICAgICBFUlJPUjogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6MTk0OiAgTXVsdGkgbGluZSBj b250cm9sIGNsYXVzZXMgc2hvdWxkIHVzZSBicmFjZXMuICBbd2hpdGVzcGFjZS9icmFjZXNdIFs0 XQorICAgICAgICBFUlJPUjogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6Mzk4OiAgT25lIGxpbmUgY29udHJv bCBjbGF1c2VzIHNob3VsZCBub3QgdXNlIGJyYWNlcy4gIFt3aGl0ZXNwYWNlL2JyYWNlc10gWzRd CisgICAgICAgIEVSUk9SOiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDo0NDA6ICBPbmUgbGluZSBjb250cm9s IGNsYXVzZXMgc2hvdWxkIG5vdCB1c2UgYnJhY2VzLiAgW3doaXRlc3BhY2UvYnJhY2VzXSBbNF0K KyAgICAgICAgRVJST1I6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOjgwNjogIE1vcmUgdGhhbiBvbmUgY29t bWFuZCBvbiB0aGUgc2FtZSBsaW5lICBbd2hpdGVzcGFjZS9uZXdsaW5lXSBbNF0KKyAgICAgICAg RVJST1I6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwOjg2OTogIE1vcmUgdGhhbiBvbmUgY29tbWFuZCBvbiB0 aGUgc2FtZSBsaW5lICBbd2hpdGVzcGFjZS9uZXdsaW5lXSBbNF0KKyAgICAgICAgRVJST1I6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXIuY3BwOjg4MDogIE1vcmUgdGhhbiBvbmUgY29tbWFuZCBvbiB0aGUgc2FtZSBs aW5lICBbd2hpdGVzcGFjZS9uZXdsaW5lXSBbNF0KKyAgICAgICAgRVJST1I6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwOjk0MDogIE1vcmUgdGhhbiBvbmUgY29tbWFuZCBvbiB0aGUgc2FtZSBsaW5lICBbd2hp dGVzcGFjZS9uZXdsaW5lXSBbNF0KKyAgICAgICAgRVJST1I6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOjEx MDI6ICBNdWx0aSBsaW5lIGNvbnRyb2wgY2xhdXNlcyBzaG91bGQgdXNlIGJyYWNlcy4gIFt3aGl0 ZXNwYWNlL2JyYWNlc10gWzRdCisgICAgICAgIEVSUk9SOiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoxMTA5 OiAgTXVsdGkgbGluZSBjb250cm9sIGNsYXVzZXMgc2hvdWxkIHVzZSBicmFjZXMuICBbd2hpdGVz cGFjZS9icmFjZXNdIFs0XQorCisgICAgICAgIEluZGVudGF0aW9uIGFuZCBzdHlsZSBpc3N1ZSBm aXhlZCBvbmx5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnJlZ2lzdGVyTWVkaWFFbmdpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp+TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2hh bmdlUGlwZWxpbmVTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnBsYXkpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjp2aWRlb0NoYW5nZWRDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvU2lua0NhcHNDaGFuZ2VkQ2FsbGJhY2spOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjphdWRpb0NoYW5nZWRD YWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OnRleHRDaGFuZ2VkQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjpidWZmZXJlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWROZXh0TG9jYXRpb24pOgorCiAyMDE4LTA1LTA5ICBZ YWNpbmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CiAKICAgICAg ICAgW0VNRV1bR1N0cmVhbWVyXSBDcmFzaCB3aGVuIHRoZSBtZWRpYUtleXMgYXJlIGNyZWF0ZWQg YmVmb3JlIGxvYWRpbmcgdGhlIG1lZGlhIGluIGRlYnVnIGNvbmYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggMzZhOTUyNjJlZjQuLjJkMTk5 YjhlZGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcApAQCAtMTA4LDkgKzEwOCwxMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6c2V0QXVkaW9TdHJlYW1Qcm9wZXJ0aWVzKEdPYmplY3QqIG9iamVjdCkKIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnJlZ2lzdGVyTWVkaWFFbmdpbmUoTWVkaWFFbmdpbmVS ZWdpc3RyYXIgcmVnaXN0cmFyKQogewotICAgIGlmIChpc0F2YWlsYWJsZSgpKQorICAgIGlmIChp c0F2YWlsYWJsZSgpKSB7CiAgICAgICAgIHJlZ2lzdHJhcihbXShNZWRpYVBsYXllciogcGxheWVy KSB7IHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcj4o cGxheWVyKTsgfSwKICAgICAgICAgICAgIGdldFN1cHBvcnRlZFR5cGVzLCBzdXBwb3J0c1R5cGUs IG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIsIHN1cHBvcnRzS2V5U3lzdGVtKTsKKyAgICB9CiB9 CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppc0F2YWlsYWJsZSgpCkBAIC0x ODgsOSArMTg5LDEwIEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcigpCiAgICAgaWYgKFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNlLmdl dCgpKSAmJiBHU1RfT0JKRUNUX1BBUkVOVChtX3NvdXJjZS5nZXQoKSkpCiAgICAgICAgIGdfc2ln bmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhHU1RfRUxFTUVOVF9QQVJFTlQobV9zb3Vy Y2UuZ2V0KCkpLCByZWludGVycHJldF9jYXN0PGdwb2ludGVyPih1cmlEZWNvZGVCaW5FbGVtZW50 QWRkZWRDYWxsYmFjayksIHRoaXMpOwogCi0gICAgaWYgKG1fYXV0b0F1ZGlvU2luaykKKyAgICBp ZiAobV9hdXRvQXVkaW9TaW5rKSB7CiAgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5l Y3RfYnlfZnVuYyhHX09CSkVDVChtX2F1dG9BdWRpb1NpbmsuZ2V0KCkpLAogICAgICAgICAgICAg cmVpbnRlcnByZXRfY2FzdDxncG9pbnRlcj4oc2V0QXVkaW9TdHJlYW1Qcm9wZXJ0aWVzQ2FsbGJh Y2spLCB0aGlzKTsKKyAgICB9CiAKICAgICBtX3JlYWR5VGltZXJIYW5kbGVyLnN0b3AoKTsKICAg ICBmb3IgKGF1dG8mIG1pc3NpbmdQbHVnaW5DYWxsYmFjayA6IG1fbWlzc2luZ1BsdWdpbkNhbGxi YWNrcykgewpAQCAtMzc1LDkgKzM3Nyw4IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpjaGFuZ2VQaXBlbGluZVN0YXRlKEdzdFN0YXRlIG5ld1N0YXRlKQogCiAgICAgR3N0U3Rh dGVDaGFuZ2VSZXR1cm4gc2V0U3RhdGVSZXN1bHQgPSBnc3RfZWxlbWVudF9zZXRfc3RhdGUobV9w aXBlbGluZS5nZXQoKSwgbmV3U3RhdGUpOwogICAgIEdzdFN0YXRlIHBhdXNlZE9yUGxheWluZyA9 IG5ld1N0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HID8gR1NUX1NUQVRFX1BBVVNFRCA6IEdTVF9T VEFURV9QTEFZSU5HOwotICAgIGlmIChjdXJyZW50U3RhdGUgIT0gcGF1c2VkT3JQbGF5aW5nICYm IHNldFN0YXRlUmVzdWx0ID09IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRSkgeworICAgIGlmIChj dXJyZW50U3RhdGUgIT0gcGF1c2VkT3JQbGF5aW5nICYmIHNldFN0YXRlUmVzdWx0ID09IEdTVF9T VEFURV9DSEFOR0VfRkFJTFVSRSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KIAogICAg IC8vIENyZWF0ZSBhIHRpbWVyIHdoZW4gZW50ZXJpbmcgdGhlIFJFQURZIHN0YXRlIHNvIHRoYXQg d2UgY2FuIGZyZWUgcmVzb3VyY2VzCiAgICAgLy8gaWYgd2Ugc3RheSBmb3IgdG9vIGxvbmcgb24g UkVBRFkuCkBAIC00MTcsOSArNDE4LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnBsYXkoKQogICAgICAgICBtX3ByZWxvYWQgPSBNZWRpYVBsYXllcjo6QXV0bzsKICAgICAg ICAgc2V0RG93bmxvYWRCdWZmZXJpbmcoKTsKICAgICAgICAgR1NUX0lORk8oIlBsYXkiKTsKLSAg ICB9IGVsc2UgeworICAgIH0gZWxzZQogICAgICAgICBsb2FkaW5nRmFpbGVkKE1lZGlhUGxheWVy OjpFbXB0eSk7Ci0gICAgfQogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 cGF1c2UoKQpAQCAtNzc1LDcgKzc3NSw5IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjplbmFibGVUcmFjayhUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyOjpUcmFja1R5CiAKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2aWRlb0NoYW5nZWRDYWxsYmFjayhNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIqIHBsYXllcikKIHsKLSAgICBwbGF5ZXItPm1fbm90aWZp ZXItPm5vdGlmeShNYWluVGhyZWFkTm90aWZpY2F0aW9uOjpWaWRlb0NoYW5nZWQsIFtwbGF5ZXJd IHsgcGxheWVyLT5ub3RpZnlQbGF5ZXJPZlZpZGVvKCk7IH0pOworICAgIHBsYXllci0+bV9ub3Rp Zmllci0+bm90aWZ5KE1haW5UaHJlYWROb3RpZmljYXRpb246OlZpZGVvQ2hhbmdlZCwgW3BsYXll cl0geworICAgICAgICBwbGF5ZXItPm5vdGlmeVBsYXllck9mVmlkZW8oKTsKKyAgICB9KTsKIH0K IAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXllck9mVmlkZW8o KQpAQCAtODM4LDcgKzg0MCw5IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpu b3RpZnlQbGF5ZXJPZlZpZGVvKCkKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OnZpZGVvU2lua0NhcHNDaGFuZ2VkQ2FsbGJhY2soTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy KiBwbGF5ZXIpCiB7Ci0gICAgcGxheWVyLT5tX25vdGlmaWVyLT5ub3RpZnkoTWFpblRocmVhZE5v dGlmaWNhdGlvbjo6VmlkZW9DYXBzQ2hhbmdlZCwgW3BsYXllcl0geyBwbGF5ZXItPm5vdGlmeVBs YXllck9mVmlkZW9DYXBzKCk7IH0pOworICAgIHBsYXllci0+bV9ub3RpZmllci0+bm90aWZ5KE1h aW5UaHJlYWROb3RpZmljYXRpb246OlZpZGVvQ2Fwc0NoYW5nZWQsIFtwbGF5ZXJdIHsKKyAgICAg ICAgcGxheWVyLT5ub3RpZnlQbGF5ZXJPZlZpZGVvQ2FwcygpOworICAgIH0pOwogfQogCiB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZWaWRlb0NhcHMoKQpA QCAtODQ5LDcgKzg1Myw5IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3Rp ZnlQbGF5ZXJPZlZpZGVvQ2FwcygpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy OjphdWRpb0NoYW5nZWRDYWxsYmFjayhNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIqIHBsYXll cikKIHsKLSAgICBwbGF5ZXItPm1fbm90aWZpZXItPm5vdGlmeShNYWluVGhyZWFkTm90aWZpY2F0 aW9uOjpBdWRpb0NoYW5nZWQsIFtwbGF5ZXJdIHsgcGxheWVyLT5ub3RpZnlQbGF5ZXJPZkF1ZGlv KCk7IH0pOworICAgIHBsYXllci0+bV9ub3RpZmllci0+bm90aWZ5KE1haW5UaHJlYWROb3RpZmlj YXRpb246OkF1ZGlvQ2hhbmdlZCwgW3BsYXllcl0geworICAgICAgICBwbGF5ZXItPm5vdGlmeVBs YXllck9mQXVkaW8oKTsKKyAgICB9KTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6Om5vdGlmeVBsYXllck9mQXVkaW8oKQpAQCAtOTA5LDcgKzkxNSw5IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZkF1ZGlvKCkKICNpZiBFTkFC TEUoVklERU9fVFJBQ0spCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dGV4dENo YW5nZWRDYWxsYmFjayhNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIqIHBsYXllcikKIHsKLSAg ICBwbGF5ZXItPm1fbm90aWZpZXItPm5vdGlmeShNYWluVGhyZWFkTm90aWZpY2F0aW9uOjpUZXh0 Q2hhbmdlZCwgW3BsYXllcl0geyBwbGF5ZXItPm5vdGlmeVBsYXllck9mVGV4dCgpOyB9KTsKKyAg ICBwbGF5ZXItPm1fbm90aWZpZXItPm5vdGlmeShNYWluVGhyZWFkTm90aWZpY2F0aW9uOjpUZXh0 Q2hhbmdlZCwgW3BsYXllcl0geworICAgICAgICBwbGF5ZXItPm5vdGlmeVBsYXllck9mVGV4dCgp OworICAgIH0pOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5 UGxheWVyT2ZUZXh0KCkKQEAgLTEwNzEsMTYgKzEwNzksMTggQEAgc3RkOjp1bmlxdWVfcHRyPFBs YXRmb3JtVGltZVJhbmdlcz4gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpidWZmZXJlZCgp IGNvbnMKICAgICBndWludCBudW1CdWZmZXJpbmdSYW5nZXMgPSBnc3RfcXVlcnlfZ2V0X25fYnVm ZmVyaW5nX3JhbmdlcyhxdWVyeSk7CiAgICAgZm9yIChndWludCBpbmRleCA9IDA7IGluZGV4IDwg bnVtQnVmZmVyaW5nUmFuZ2VzOyBpbmRleCsrKSB7CiAgICAgICAgIGdpbnQ2NCByYW5nZVN0YXJ0 ID0gMCwgcmFuZ2VTdG9wID0gMDsKLSAgICAgICAgaWYgKGdzdF9xdWVyeV9wYXJzZV9udGhfYnVm ZmVyaW5nX3JhbmdlKHF1ZXJ5LCBpbmRleCwgJnJhbmdlU3RhcnQsICZyYW5nZVN0b3ApKQorICAg ICAgICBpZiAoZ3N0X3F1ZXJ5X3BhcnNlX250aF9idWZmZXJpbmdfcmFuZ2UocXVlcnksIGluZGV4 LCAmcmFuZ2VTdGFydCwgJnJhbmdlU3RvcCkpIHsKICAgICAgICAgICAgIHRpbWVSYW5nZXMtPmFk ZChNZWRpYVRpbWUocmFuZ2VTdGFydCAqIHRvR3N0VW5zaWduZWQ2NFRpbWUobWVkaWFEdXJhdGlv bikgLyBHU1RfRk9STUFUX1BFUkNFTlRfTUFYLCBHU1RfU0VDT05EKSwKICAgICAgICAgICAgICAg ICBNZWRpYVRpbWUocmFuZ2VTdG9wICogdG9Hc3RVbnNpZ25lZDY0VGltZShtZWRpYUR1cmF0aW9u KSAvIEdTVF9GT1JNQVRfUEVSQ0VOVF9NQVgsIEdTVF9TRUNPTkQpKTsKKyAgICAgICAgfQogICAg IH0KIAogICAgIC8vIEZhbGxiYWNrIHRvIHRoZSBtb3JlIGdlbmVyYWwgbWF4VGltZUxvYWRlZCgp IGlmIG5vIHJhbmdlIGhhcwogICAgIC8vIGJlZW4gZm91bmQuCi0gICAgaWYgKCF0aW1lUmFuZ2Vz LT5sZW5ndGgoKSkKKyAgICBpZiAoIXRpbWVSYW5nZXMtPmxlbmd0aCgpKSB7CiAgICAgICAgIGlm IChNZWRpYVRpbWUgbG9hZGVkID0gbWF4VGltZUxvYWRlZCgpKQogICAgICAgICAgICAgdGltZVJh bmdlcy0+YWRkKE1lZGlhVGltZTo6emVyb1RpbWUoKSwgbG9hZGVkKTsKKyAgICB9CiAKICAgICBn c3RfcXVlcnlfdW5yZWYocXVlcnkpOwogCkBAIC0yMDA0LDggKzIwMTQsNyBAQCBib29sIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZE5leHRMb2NhdGlvbigpCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAotICAgICAgICBjb25zdCBHVmFsdWUqIGxvY2F0aW9u ID0gZ3N0X3ZhbHVlX2xpc3RfZ2V0X3ZhbHVlKGxvY2F0aW9ucywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX21lZGlhTG9jYXRpb25D dXJyZW50SW5kZXgpOworICAgICAgICBjb25zdCBHVmFsdWUqIGxvY2F0aW9uID0gZ3N0X3ZhbHVl X2xpc3RfZ2V0X3ZhbHVlKGxvY2F0aW9ucywgbV9tZWRpYUxvY2F0aW9uQ3VycmVudEluZGV4KTsK ICAgICAgICAgY29uc3QgR3N0U3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBnc3RfdmFsdWVfZ2V0X3N0 cnVjdHVyZShsb2NhdGlvbik7CiAKICAgICAgICAgaWYgKCFzdHJ1Y3R1cmUpIHsKLS0gCjIuMTcu MA==