116070 2013-05-13 16:10:36 -0700 Better filtering CSS errors. 2013-05-15 17:42:00 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 rniwa glenn benjamin commit-queue dino esprehn+autocc glenn joepeck kling koivisto macpherson menard mkwst timothy oldest_to_newest 888561 0 rniwa 2013-05-13 16:10:36 -0700 We should probably merge https://chromium.googlesource.com/chromium/blink/+/c655fe1e72ca6b35e680b069410f320e51ca6aae 889032 1 201760 glenn 2013-05-14 14:34:21 -0700 Created attachment 201760 Patch 889108 2 benjamin 2013-05-14 20:08:41 -0700 This is odd layering. Joseph, Tim, what do you think? 889117 3 glenn 2013-05-14 20:47:31 -0700 (In reply to comment #2) > This is odd layering. Joseph, Tim, what do you think? I rather thought so myself, but I stayed (fairly) faithful to the merge set source. Please suggest changes as you prefer. 889122 4 benjamin 2013-05-14 21:07:25 -0700 > I rather thought so myself, but I stayed (fairly) faithful to the merge set source. Please suggest changes as you prefer. I would not take this one patch. I think this change makes the architecture worse. Maybe the Inspectors gurus will disagree, lets see what they say. 889143 5 joepeck 2013-05-14 22:56:19 -0700 I thought our Inspector CSS parsing error support was incomplete. I think the Blink split when it was partially done, so we don't get any CSS parsing errors in the inspector right now. So I'm not sure how useful it would be to take the patch unless someone wants to fully merge reporting CSS errors. As for the patch itself, I agree it seems a bit weird to have the "Inspector" filter errors in the CSS Parser like that. 889166 6 201760 benjamin 2013-05-14 23:52:04 -0700 Comment on attachment 201760 Patch Looks like we should not take this one. Still, thank you Glenn for looking for blink patches that could be good for WebKit. 889348 7 glenn 2013-05-15 09:37:43 -0700 (In reply to comment #6) > (From update of attachment 201760 [details]) > Looks like we should not take this one. > > Still, thank you Glenn for looking for blink patches that could be good for WebKit. Actually, Ryosuke suggested this be merged, and I was just back filling. :) As you can see from https://bugs.webkit.org/attachment.cgi?id=201760&action=review, there is already filtering occurring in InspectorConsoleAgent::addMessageToConsole in a kludgey fashion: > Source/WebCore/inspector/InspectorConsoleAgent.cpp:-191 > - // Ignore errors like "*property=value". This trick is used for IE7: http://stackoverflow.com/questions/4563651/what-does-an-asterisk-do-in-a-css-property-name > - if (source == CSSMessageSource && message.contains(": *")) > - return; > - which seems equally out of place (as a layering violation). For whatever reason, it looks like the blink patch writer chose to reinforce that violation by keeping the filter in the inspector. A better, non-layer-violating solution would simply be to place the filtering function in or around CSSParser::syntaxError, and not move CSSParser::Location to WebCore::CSSParserLocation. How about I update the patch accordingly to take this better approach? 889351 8 rniwa 2013-05-15 09:39:58 -0700 I think we should simply ignore the inspector change since we don't enable that feature in WebKit anyway, and someone has to finish implementing the feature or remove it. 889596 9 glenn 2013-05-15 17:42:00 -0700 The blink merge set violates layers and appears only to handle a special IE7 compatibility case anyway. So let's not merge this one. I will instead file a new bug to remove the special IE7 code from InspectorConsoleAgent. 201760 2013-05-14 14:34:21 -0700 2013-05-14 23:52:04 -0700 Patch bug-116070-20130514153318.patch text/plain 8356 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDZiZjU1MWNlMjIxYzQw ZjQ1NGRhMTJhNDdhYWUzODQ2NGI1OTdlMS4uZTRmMmFmNjYzNmI4MGY5ZmI5ZTQ5NGYyNDBmYWVk NTI3OWE1OTNlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA1LTE0ICBHbGVu biBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CisKKyAgICAgICAgQmV0dGVyIGZpbHRlcmluZyBD U1MgZXJyb3JzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE2MDcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTWVyZ2UgaHR0cHM6Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5r LysvYzY1NWZlMWU3MmNhNmIzNWU2ODBiMDY5NDEwZjMyMGU1MWNhNmFhZQorCisgICAgICAgICog Y3NzL0NTU0dyYW1tYXIueS5pbjogVXNlIENTU1BhcnNlckxvY2F0aW9uLgorICAgICAgICAqIGNz cy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpjdXJyZW50TG9j YXRpb24pOiBVc2UgQ1NTUGFyc2VyTG9jYXRpb24uCisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJz ZXI6OnN5bnRheEVycm9yKTogVXNlIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y3NzRXJyb3JG aWx0ZXIgdG8gZmlsdGVyIHN5bnRheCBlcnJvcnMuCisgICAgICAgICogY3NzL0NTU1BhcnNlci5o OgorICAgICAgICAoQ1NTUGFyc2VyKTogTW92ZSBDU1NQYXJzZXI6OkxvY2F0aW9uIHRvIFdlYkNv cmU6OkNTU1BhcnNlckxvY2F0aW9uLgorICAgICAgICAqIGNzcy9DU1NQYXJzZXJWYWx1ZXMuaDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlclN0cmluZzo6b3BlcmF0b3JbXSk6IE1ha2UgY29u c3QgdG8gaGFuZGxlIGNzc0Vycm9yRmlsdGVyIHVzYWdlLgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u c29sZUFnZW50OjphZGRNZXNzYWdlVG9Db25zb2xlKTogSGFuZGxlIENTUyBlcnJvciBmaWx0ZXJp bmcgdXBzdHJlYW0uCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oOgorICAgICAgICAoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uKTogQWRkIHN0YXRpYyBDU1Mg ZXJyb3IgZmlsdGVyIGhlbHBlci4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6Y3NzRXJyb3JGaWx0ZXIpOiBBZGQgc3RhdGljIENTUyBlcnJvciBmaWx0ZXIgaGVs cGVyLgorCiAyMDEzLTA1LTE0ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgog CiAgICAgICAgIEhlYXAtdXNlLWFmdGVyLWZyZWUgaW4gV2ViQ29yZTo6UmVuZGVyQm94OjpleGNs dXNpb25TaGFwZU91dHNpZGVJbmZvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT R3JhbW1hci55LmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYW1tYXIueS5pbgppbmRleCA2 ZTRkZGQ0NDJlOTM1MzI0MjIyZDE4YTAwYWI5M2E5ZDdlM2Q3MTEyLi5mZTMxZmY4ODRlY2MwM2Jk ODQ2YjY0MTcyODc5MTI1ZDgyZTY2YzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTR3JhbW1hci55LmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkuaW4K QEAgLTUwLDcgKzUwLDcgQEAKICAgICBWZWN0b3I8UmVmUHRyPFN0eWxlS2V5ZnJhbWU+ID4qIGtl eWZyYW1lUnVsZUxpc3Q7CiAgICAgZmxvYXQgdmFsOwogICAgIENTU1Byb3BlcnR5SUQgaWQ7Ci0g ICAgQ1NTUGFyc2VyOjpMb2NhdGlvbiBsb2NhdGlvbjsKKyAgICBDU1NQYXJzZXJMb2NhdGlvbiBs b2NhdGlvbjsKIH0KIAogJXsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJz ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5kZXggZmI4ZjkyNmUz YmZmMzcyZDA1MmIyNThkZjc5NTNjNjNkNGExMDg3YS4uOTZlYjM0NjJhMjFlNjdhODg2NjYzYmFj ZTA4YTU3OWNmNmE1MmM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKQEAgLTY0LDYgKzY0 LDcgQEAKICNpbmNsdWRlICJIVE1MUGFyc2VySWRpb21zLmgiCiAjaW5jbHVkZSAiSGFzaFRvb2xz LmgiCiAjaW5jbHVkZSAiSGlzdG9ncmFtU3VwcG9ydC5oIgorI2luY2x1ZGUgIkluc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIk1lZGlhTGlzdC5oIgogI2luY2x1ZGUgIk1lZGlh UXVlcnlFeHAuaCIKICNpbmNsdWRlICJQYWdlLmgiCkBAIC05OTUzLDkgKzk5NTQsOSBAQCBpbmxp bmUgVUNoYXIqIENTU1BhcnNlcjo6dG9rZW5TdGFydDxVQ2hhcj4oKQogICAgIHJldHVybiBtX3Rv a2VuU3RhcnQucHRyMTY7CiB9CiAKLUNTU1BhcnNlcjo6TG9jYXRpb24gQ1NTUGFyc2VyOjpjdXJy ZW50TG9jYXRpb24oKQorQ1NTUGFyc2VyTG9jYXRpb24gQ1NTUGFyc2VyOjpjdXJyZW50TG9jYXRp b24oKQogewotICAgIExvY2F0aW9uIGxvY2F0aW9uOworICAgIENTU1BhcnNlckxvY2F0aW9uIGxv Y2F0aW9uOwogICAgIGxvY2F0aW9uLmxpbmVOdW1iZXIgPSBtX3Rva2VuU3RhcnRMaW5lTnVtYmVy OwogICAgIGlmIChpczhCaXRTb3VyY2UoKSkKICAgICAgICAgbG9jYXRpb24udG9rZW4uaW5pdCh0 b2tlblN0YXJ0PExDaGFyPigpLCBjdXJyZW50Q2hhcmFjdGVyPExDaGFyPigpIC0gdG9rZW5TdGFy dDxMQ2hhcj4oKSk7CkBAIC0xMTQ4NSwxMCArMTE0ODYsMTIgQEAgUGFzc1JlZlB0cjxDU1NSdWxl U291cmNlRGF0YT4gQ1NTUGFyc2VyOjpwb3BSdWxlRGF0YSgpCiAgICAgcmV0dXJuIGRhdGEucmVs ZWFzZSgpOwogfQogCi12b2lkIENTU1BhcnNlcjo6c3ludGF4RXJyb3IoY29uc3QgTG9jYXRpb24m IGxvY2F0aW9uLCBTeW50YXhFcnJvclR5cGUgZXJyb3IpCit2b2lkIENTU1BhcnNlcjo6c3ludGF4 RXJyb3IoY29uc3QgQ1NTUGFyc2VyTG9jYXRpb24mIGxvY2F0aW9uLCBTeW50YXhFcnJvclR5cGUg ZXJyb3IpCiB7CiAgICAgaWYgKCFpc0xvZ2dpbmdFcnJvcnMoKSkKICAgICAgICAgcmV0dXJuOwor ICAgIGlmICghSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjc3NFcnJvckZpbHRlcihsb2NhdGlv biwgZXJyb3IpKQorICAgICAgICByZXR1cm47CiAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwog ICAgIHN3aXRjaCAoZXJyb3IpIHsKICAgICBjYXNlIFByb3BlcnR5RGVjbGFyYXRpb25FcnJvcjoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQYXJzZXIuaAppbmRleCA5YTIyMmE5ZGQ0NGExNTM4MjA4MDAzNjUzOGUzMzRi ZDE0ODg0NGI5Li43NTRkMjk2NTY5NWNjOWYxZTA2ZWE4NjVhMTRiMDY3OGFiOTVjNDY2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU1BhcnNlci5oCkBAIC03MiwxMSArNzIsMTIgQEAgY2xhc3MgV2ViS2l0Q1NTTWl4 RnVuY3Rpb25WYWx1ZTsKIGNsYXNzIFdlYktpdENTU1NoYWRlclZhbHVlOwogI2VuZGlmCiAKK3N0 cnVjdCBDU1NQYXJzZXJMb2NhdGlvbjsKKwogY2xhc3MgQ1NTUGFyc2VyIHsKICAgICBmcmllbmQg aW5saW5lIGludCBjc3N5eWxleCh2b2lkKiwgQ1NTUGFyc2VyKik7CiAKIHB1YmxpYzoKLSAgICBz dHJ1Y3QgTG9jYXRpb247CiAgICAgZW51bSBTeW50YXhFcnJvclR5cGUgewogICAgICAgICBQcm9w ZXJ0eURlY2xhcmF0aW9uRXJyb3IsCiAgICAgICAgIEdlbmVyYWxTeW50YXhFcnJvcgpAQCAtNDI2 LDcgKzQyNyw3IEBAIHB1YmxpYzoKICAgICBQYXNzUmVmUHRyPENTU1J1bGVTb3VyY2VEYXRhPiBw b3BSdWxlRGF0YSgpOwogICAgIHZvaWQgcmVzZXRQcm9wZXJ0eVJhbmdlKCkgeyBtX3Byb3BlcnR5 UmFuZ2Uuc3RhcnQgPSBtX3Byb3BlcnR5UmFuZ2UuZW5kID0gVUlOVF9NQVg7IH0KICAgICBib29s IGlzRXh0cmFjdGluZ1NvdXJjZURhdGEoKSBjb25zdCB7IHJldHVybiAhIW1fY3VycmVudFJ1bGVE YXRhU3RhY2s7IH0KLSAgICB2b2lkIHN5bnRheEVycm9yKGNvbnN0IExvY2F0aW9uJiwgU3ludGF4 RXJyb3JUeXBlID0gR2VuZXJhbFN5bnRheEVycm9yKTsKKyAgICB2b2lkIHN5bnRheEVycm9yKGNv bnN0IENTU1BhcnNlckxvY2F0aW9uJiwgU3ludGF4RXJyb3JUeXBlID0gR2VuZXJhbFN5bnRheEVy cm9yKTsKIAogICAgIGlubGluZSBpbnQgbGV4KHZvaWQqIHl5bHZhbCkgeyByZXR1cm4gKHRoaXMt PiptX2xleEZ1bmMpKHl5bHZhbCk7IH0KIApAQCAtNDQ2LDcgKzQ0Nyw3IEBAIHB1YmxpYzoKIAog ICAgIHN0YXRpYyBLVVJMIGNvbXBsZXRlVVJMKGNvbnN0IENTU1BhcnNlckNvbnRleHQmLCBjb25z dCBTdHJpbmcmIHVybCk7CiAKLSAgICBMb2NhdGlvbiBjdXJyZW50TG9jYXRpb24oKTsKKyAgICBD U1NQYXJzZXJMb2NhdGlvbiBjdXJyZW50TG9jYXRpb24oKTsKIAogcHJpdmF0ZToKICAgICBib29s IGlzOEJpdFNvdXJjZSgpIHsgcmV0dXJuIG1faXM4Qml0U291cmNlOyB9CkBAIC03MDIsNyArNzAz LDcgQEAgcHJpdmF0ZToKICAgICBDU1NQYXJzZXIqIG1fcGFyc2VyOwogfTsKIAotc3RydWN0IENT U1BhcnNlcjo6TG9jYXRpb24geworc3RydWN0IENTU1BhcnNlckxvY2F0aW9uIHsKICAgICBpbnQg bGluZU51bWJlcjsKICAgICBDU1NQYXJzZXJTdHJpbmcgdG9rZW47CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlclZhbHVlcy5oIGIvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1BhcnNlclZhbHVlcy5oCmluZGV4IDczNDk2MzkyMjc1MzUwMzUxOGZiMTRmMTBlNWY4NWQ2 NDkyZjM0MmQuLjU4OTA0NjM3MjQ5ODI5ZGNhMjFkZjM3YzI4OGEzM2Q3NzE2NmRkY2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXJWYWx1ZXMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyVmFsdWVzLmgKQEAgLTc2LDcgKzc2LDcgQEAgc3RydWN0IENT U1BhcnNlclN0cmluZyB7CiAKICAgICB2b2lkIGxvd2VyKCk7CiAKLSAgICBVQ2hhciBvcGVyYXRv cltdKHVuc2lnbmVkIGkpCisgICAgVUNoYXIgb3BlcmF0b3JbXSh1bnNpZ25lZCBpKSBjb25zdAog ICAgIHsKICAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oaSA8IG1fbGVu Z3RoKTsKICAgICAgICAgaWYgKGlzOEJpdCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcAppbmRleCA1NzZkZWIwZTFlMjMzMDk4MWZj MDQ2YTYxNjFiMjMyNTAwOTE2Y2JmLi5mYTgwYzI3NWZiZTQ4YjljMzNmNGVjOTNjNmYwNjRiZTc2 ZDNkMzA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u c29sZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u c29sZUFnZW50LmNwcApAQCAtMTg4LDEwICsxODgsNiBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVB Z2VudDo6YWRkTWVzc2FnZVRvQ29uc29sZShNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5 cAogICAgICAgICBjbGVhck1lc3NhZ2VzKCZlcnJvcik7CiAgICAgfQogCi0gICAgLy8gSWdub3Jl IGVycm9ycyBsaWtlICIqcHJvcGVydHk9dmFsdWUiLiBUaGlzIHRyaWNrIGlzIHVzZWQgZm9yIElF NzogaHR0cDovL3N0YWNrb3ZlcmZsb3cuY29tL3F1ZXN0aW9ucy80NTYzNjUxL3doYXQtZG9lcy1h bi1hc3Rlcmlzay1kby1pbi1hLWNzcy1wcm9wZXJ0eS1uYW1lCi0gICAgaWYgKHNvdXJjZSA9PSBD U1NNZXNzYWdlU291cmNlICYmIG1lc3NhZ2UuY29udGFpbnMoIjogKiIpKQotICAgICAgICByZXR1 cm47Ci0KICAgICBib29sIGNhbkdlbmVyYXRlQ2FsbFN0YWNrID0gIWlzV29ya2VyQWdlbnQoKSAm JiBtX2Zyb250ZW5kOwogICAgIGFkZENvbnNvbGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xl TWVzc2FnZShjYW5HZW5lcmF0ZUNhbGxTdGFjaywgc291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2Fn ZSwgc2NyaXB0SWQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgc3RhdGUsIHJlcXVlc3RJZGVu dGlmaWVyKSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5oCmluZGV4IDI5NzdkMjJjNjQ2ODQ3ZjYwM2NjMzY0ZDU2NjhlYzkw ZGU3ZDZlYTUuLjhmNzQ0NTEyNWFiMTVmOGQ3MmVhNTIzNTQ4ZjA2ZTJkZTQzOWYyZDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u LmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uX2gK ICNkZWZpbmUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uX2gKIAorI2luY2x1ZGUgIkNTU1BhcnNl ci5oIgogI2luY2x1ZGUgIkNTU1NlbGVjdG9yLmgiCiAjaW5jbHVkZSAiQ29uc29sZUFQSVR5cGVz LmgiCiAjaW5jbHVkZSAiQ29uc29sZVR5cGVzLmgiCkBAIC01MCw2ICs1MSw3IEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorc3RydWN0IENTU1BhcnNlckxvY2F0aW9uOwogY2xhc3MgQ1NTUnVs ZTsKIGNsYXNzIENhY2hlZFJlc291cmNlOwogY2xhc3MgQ2hhcmFjdGVyRGF0YTsKQEAgLTI0OCw2 ICsyNTAsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNv b2tpZSB3aWxsRmlyZUFuaW1hdGlvbkZyYW1lKERvY3VtZW50KiwgaW50IGNhbGxiYWNrSWQpOwog ICAgIHN0YXRpYyB2b2lkIGRpZEZpcmVBbmltYXRpb25GcmFtZShjb25zdCBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb25Db29raWUmKTsKIAorICAgIHN0YXRpYyBib29sIGNzc0Vycm9yRmlsdGVyKGNv bnN0IENTU1BhcnNlckxvY2F0aW9uJiwgaW50IGVycm9yVHlwZSk7CisKICNpZiBFTkFCTEUoSkFW QVNDUklQVF9ERUJVR0dFUikKICAgICBzdGF0aWMgdm9pZCBhZGRTdGFydFByb2ZpbGluZ01lc3Nh Z2VUb0NvbnNvbGUoUGFnZSosIGNvbnN0IFN0cmluZyYgdGl0bGUsIHVuc2lnbmVkIGxpbmVOdW1i ZXIsIHVuc2lnbmVkIGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpOwogICAg IHN0YXRpYyB2b2lkIGFkZFByb2ZpbGUoUGFnZSosIFJlZlB0cjxTY3JpcHRQcm9maWxlPiwgUGFz c1JlZlB0cjxTY3JpcHRDYWxsU3RhY2s+KTsKQEAgLTE5ODQsNiArMTk4OCwxOSBAQCBpbmxpbmUg dm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZpcmVBbmltYXRpb25GcmFtZShjb25z dCBJbnNwZWN0b3JJbnN0cgogI2VuZGlmCiB9CiAKK2lubGluZSBib29sIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6Y3NzRXJyb3JGaWx0ZXIoY29uc3QgQ1NTUGFyc2VyTG9jYXRpb24mIGxvY2F0 aW9uLCBpbnQgZXJyb3JUeXBlKQoreworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgLy8gSWdu b3JlIGVycm9ycyBsaWtlICIqcHJvcGVydHk6IHZhbHVlIi4gVGhpcyB0cmljayBpcyB1c2VkIGZv ciBJRTc6IGh0dHA6Ly9zdGFja292ZXJmbG93LmNvbS9xdWVzdGlvbnMvNDU2MzY1MS93aGF0LWRv ZXMtYW4tYXN0ZXJpc2stZG8taW4tYS1jc3MtcHJvcGVydHktbmFtZQorICAgIGlmIChlcnJvclR5 cGUgPT0gQ1NTUGFyc2VyOjpQcm9wZXJ0eURlY2xhcmF0aW9uRXJyb3IgJiYgbG9jYXRpb24udG9r ZW4ubGVuZ3RoKCkgPiAwICYmIGxvY2F0aW9uLnRva2VuWzBdID09ICcqJykKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0obG9jYXRpb24pOworICAgIFVOVVNF RF9QQVJBTShlcnJvclR5cGUpOworI2VuZGlmCisgICAgcmV0dXJuIHRydWU7Cit9CisKICNpZiBF TkFCTEUoR0VPTE9DQVRJT04pCiBpbmxpbmUgR2VvbG9jYXRpb25Qb3NpdGlvbiogSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpvdmVycmlkZUdlb2xvY2F0aW9uUG9zaXRpb24oUGFnZSogcGFnZSwg R2VvbG9jYXRpb25Qb3NpdGlvbiogcG9zaXRpb24pCiB7Cg==