161695 2016-09-07 09:39:42 -0700 Add CSSAtRule id info for new parser 2016-09-22 13:37:45 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 46591 1 hyatt hyatt oldest_to_newest 1227207 0 hyatt 2016-09-07 09:39:42 -0700 Add CSSAtRule id info for new parser 1227209 1 288149 hyatt 2016-09-07 09:41:15 -0700 Created attachment 288149 Patch 1227215 2 288149 sam 2016-09-07 09:53:14 -0700 Comment on attachment 288149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=288149&action=review > Source/WebCore/css/parser/CSSAtRuleID.h:31 > +#ifndef CSSAtRuleID_h > +#define CSSAtRuleID_h You can replace this with #pragma once > Source/WebCore/css/parser/CSSAtRuleID.h:33 > +#include <wtf/text/StringView.h> This can be replaced with <wtf/Forward.h> > Source/WebCore/css/parser/CSSAtRuleID.h:54 > +enum CSSAtRuleID { > + CSSAtRuleInvalid = 0, > + > + CSSAtRuleCharset = 1, > + CSSAtRuleFontFace = 2, > + CSSAtRuleImport = 3, > + CSSAtRuleKeyframes = 4, > + CSSAtRuleMedia = 5, > + CSSAtRuleNamespace = 6, > + CSSAtRulePage = 7, > + CSSAtRuleSupports = 8, > + CSSAtRuleViewport = 9, > + > + CSSAtRuleWebkitKeyframes = 10, > + CSSAtRuleApply = 11, > +}; > + > +CSSAtRuleID cssAtRuleID(StringView name); We don't really have a style rule on this, but you could use enum class here to make this something like: enum class CSSAtRule { Invalid , Charset, ... }; Up to you. 1227219 3 hyatt 2016-09-07 09:56:39 -0700 Landed in r205550. 288149 2016-09-07 09:41:15 -0700 2016-09-07 09:53:14 -0700 Patch patch.txt text/plain 11267 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNTU0OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA5LTA3ICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBDU1NBdFJ1bGUgaWQgaW5mbyBm b3IgbmV3IHBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTYxNjk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogY3Nz L3BhcnNlci9DU1NBdFJ1bGVJRC5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6Y3NzQXRS dWxlSUQpOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTQXRSdWxlSUQuaDogQWRkZWQuCisKIDIw MTYtMDktMDcgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFtT dHJlYW1zIEFQSV0gU2VwYXJhdGUgY29tcGlsZSBmbGFnIGZvciBSZWFkYWJsZVN0cmVhbSBhbmQg V3JpdGFibGVTdHJlYW0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CShyZXZpc2lvbiAyMDU0OTkp CisrKyBTb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTM0 OSw2ICsxMzQ5LDcgQEAgc2V0KFdlYkNvcmVfU09VUkNFUwogICAgIGNzcy9XZWJLaXRDU1NUcmFu c2Zvcm1WYWx1ZS5jcHAKICAgICBjc3MvV2ViS2l0Q1NTVmlld3BvcnRSdWxlLmNwcAogCisgICAg Y3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5jcHAKICAgICBjc3MvcGFyc2VyL0NTU1BhcnNlci5jcHAK ICAgICBjc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAKICAgICBjc3MvcGFyc2VyL0NT U1BhcnNlcklkaW9tcy5jcHAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDIwNTQ5OSkKKysrIFNvdXJjZS9XZWJD b3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAt MzM3Miw2ICszMzcyLDggQEAKIAkJOTQ5Qzc3MDkxRDZFNDk4NzAwQzBERTRGIC8qIENTU1BhcnNl ck9ic2VydmVyV3JhcHBlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gOTQ5Qzc3MDcxRDZFNDhFRDAwQzBERTRGIC8qIENTU1BhcnNlck9ic2VydmVyV3Jh cHBlci5oICovOyB9OwogCQk5NDlDNzcwQjFENkU0OUVEMDBDMERFNEYgLyogQ1NTUGFyc2VyT2Jz ZXJ2ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk0 OUM3NzBBMUQ2RTQ5QzMwMEMwREU0RiAvKiBDU1NQYXJzZXJPYnNlcnZlci5oICovOyB9OwogCQk5 NERFNUM3RTFENzhDQjJFMDAxNjRGMkEgLyogQ1NTUGFyc2VySWRpb21zLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk0REU1QzdEMUQ3OENCMjUwMDE2 NEYyQSAvKiBDU1NQYXJzZXJJZGlvbXMuY3BwICovOyB9OworCQk5NERFNUM4MTFEN0YzQTE0MDAx NjRGMkEgLyogQ1NTQXRSdWxlSUQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gOTRERTVDN0YxRDdGMzlEMDAwMTY0RjJBIC8qIENTU0F0UnVsZUlELmNw cCAqLzsgfTsKKwkJOTRERTVDODIxRDdGM0ExNDAwMTY0RjJBIC8qIENTU0F0UnVsZUlELmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5NERFNUM4MDFEN0Yz OUQwMDAxNjRGMkEgLyogQ1NTQXRSdWxlSUQuaCAqLzsgfTsKIAkJOTZBQkE0MjMxNEJDQjgwRTAw RDU2MjA0IC8qIEdyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk2QUJBNDIyMTRCQ0I4MEUwMEQ1NjIw NCAvKiBHcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAgKi87IH07CiAJCTk3MDNFMUJG MTVEQzRFMzcwMDFGMjRDOCAvKiBKU1ZvaWRDYWxsYmFjay5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5N0U5RUM4QjE1REM0OTJGMDA0RjJFNzEgLyog SlNWb2lkQ2FsbGJhY2suY3BwICovOyB9OwogCQk5NzA1OTk3NzEwN0Q5NzUyMDBBNTBBN0MgLyog UG9saWN5Q2FsbGJhY2suY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gOTcwNTk5NzMxMDdEOTc1MjAwQTUwQTdDIC8qIFBvbGljeUNhbGxiYWNrLmNwcCAq LzsgfTsKQEAgLTEwNTE2LDYgKzEwNTE4LDggQEAKIAkJOTQ5Qzc3MDcxRDZFNDhFRDAwQzBERTRG IC8qIENTU1BhcnNlck9ic2VydmVyV3JhcHBlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IG5hbWUgPSBDU1NQYXJzZXJPYnNlcnZlcldyYXBwZXIuaDsgcGF0aCA9IHBhcnNlci9DU1NQYXJz ZXJPYnNlcnZlcldyYXBwZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTQ5Qzc3 MEExRDZFNDlDMzAwQzBERTRGIC8qIENTU1BhcnNlck9ic2VydmVyLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgbmFtZSA9IENTU1BhcnNlck9ic2VydmVyLmg7IHBhdGggPSBwYXJzZXIvQ1NT UGFyc2VyT2JzZXJ2ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTRERTVDN0Qx RDc4Q0IyNTAwMTY0RjJBIC8qIENTU1BhcnNlcklkaW9tcy5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IG5hbWUgPSBDU1NQYXJzZXJJZGlvbXMuY3BwOyBwYXRoID0gcGFyc2VyL0NT U1BhcnNlcklkaW9tcy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTk0REU1QzdG MUQ3RjM5RDAwMDE2NEYyQSAvKiBDU1NBdFJ1bGVJRC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IG5hbWUgPSBDU1NBdFJ1bGVJRC5jcHA7IHBhdGggPSBwYXJzZXIvQ1NTQXRSdWxl SUQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk5NERFNUM4MDFEN0YzOUQwMDAx NjRGMkEgLyogQ1NTQXRSdWxlSUQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0g Q1NTQXRSdWxlSUQuaDsgcGF0aCA9IHBhcnNlci9DU1NBdFJ1bGVJRC5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk5NTBDNEMwMkJFRDg5MzZGODE4RTJGOTkgLyogSlNTVkdHcmFwaGlj c0VsZW1lbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAz MDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTU1ZHR3JhcGhp Y3NFbGVtZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTk2QUJBNDIyMTRCQ0I4 MEUwMEQ1NjIwNCAvKiBHcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBHcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1v bi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTk3MDU5OTczMTA3RDk3NTIwMEE1 MEE3QyAvKiBQb2xpY3lDYWxsYmFjay5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBQb2xpY3lDYWxsYmFjay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBA IC0xODE0OCw2ICsxODE1Miw4IEBACiAJCTk0NkQzNzI3MUQ2Q0IyMjUwMDc3MDg0RiAvKiBwYXJz ZXIgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCTk0REU1 QzdGMUQ3RjM5RDAwMDE2NEYyQSAvKiBDU1NBdFJ1bGVJRC5jcHAgKi8sCisJCQkJOTRERTVDODAx RDdGMzlEMDAwMTY0RjJBIC8qIENTU0F0UnVsZUlELmggKi8sCiAJCQkJOTQ2RDM3MjgxRDZDQjI4 QjAwNzcwODRGIC8qIENTU1BhcnNlci5jcHAgKi8sCiAJCQkJOTQ2RDM3MjkxRDZDQjI4QjAwNzcw ODRGIC8qIENTU1BhcnNlci5oICovLAogCQkJCTk0OUM3NkZFMUQ2RTFEOEMwMEMwREU0RiAvKiBD U1NQYXJzZXJGYXN0UGF0aHMuY3BwICovLApAQCAtMjU0NjgsNiArMjU0NzQsNyBAQAogCQkJCUJD RkY2NDkxMEVBRDE1QzIwMEMxRDZGNyAvKiBMZW5ndGhCb3guaCBpbiBIZWFkZXJzICovLAogCQkJ CUU1QkE3RDYzMTUxNDM3Q0EwMEZFMUUzRiAvKiBMZW5ndGhGdW5jdGlvbnMuaCBpbiBIZWFkZXJz ICovLAogCQkJCTBGODcxNjcwMUM4NjlEODMwMDRGRjBERSAvKiBMZW5ndGhQb2ludC5oIGluIEhl YWRlcnMgKi8sCisJCQkJOTRERTVDODIxRDdGM0ExNDAwMTY0RjJBIC8qIENTU0F0UnVsZUlELmgg aW4gSGVhZGVycyAqLywKIAkJCQlGNDJGRkI0NjE5ODRCNzE2MDBGNjgzN0YgLyogTGVuZ3RoUmVw ZWF0LmggaW4gSGVhZGVycyAqLywKIAkJCQlCQ0ZGNjQ5MjBFQUQxNUMyMDBDMUQ2RjcgLyogTGVu Z3RoU2l6ZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJODQ3MzBEOTExMjQ4RjBCMzAwRDNBOUM5IC8q IExpZ2h0U291cmNlLmggaW4gSGVhZGVycyAqLywKQEAgLTI5NDY1LDYgKzI5NDcyLDcgQEAKIAkJ CQkxQURBNEExQzFEMjJGMkMwMDA1QTlBMTUgLyogUGF5bWVudE1lcmNoYW50U2Vzc2lvbkNvY29h Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMUE4QTY0NkUxRDE5RkY4NzAwRDBFMDBGIC8qIFBheW1l bnRNZXRob2RDb2NvYS5tbSBpbiBTb3VyY2VzICovLAogCQkJCTFBNThFODY3MUQxOUQ4MEUwMEMw RUE3MyAvKiBQYXltZW50UmVxdWVzdC5jcHAgaW4gU291cmNlcyAqLywKKwkJCQk5NERFNUM4MTFE N0YzQTE0MDAxNjRGMkEgLyogQ1NTQXRSdWxlSUQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMUE4 QTY0NjcxRDE5RkRGRjAwRDBFMDBGIC8qIFBheW1lbnRSZXF1ZXN0VmFsaWRhdG9yLmNwcCBpbiBT b3VyY2VzICovLAogCQkJCUIyNzUzNTY0MEIwNTM4MTQwMDJDRTY0RiAvKiBQREZEb2N1bWVudElt YWdlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTJENkU0Njg0MTdENjYwRjUwMEVDRjhCQiAvKiBQ REZEb2N1bWVudEltYWdlTWFjLm1tIGluIFNvdXJjZXMgKi8sCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmNwcAkobm9uZXhpc3RlbnQpCisrKyBTb3VyY2UvV2Vi Q29yZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx LDYzIEBACisvLyBDb3B5cmlnaHQgMjAxNSBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKy8vIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisvLworLy8gUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisvLyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisvLyBtZXQ6Cisv LworLy8gICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorLy8gbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorLy8gICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisvLyBjb3B5cmlnaHQgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisvLyBp biB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlCisvLyBkaXN0cmlidXRpb24uCisvLyAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xl IEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKy8vIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0 byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisvLyB0aGlzIHNvZnR3 YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorLy8KKy8vIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05U UklCVVRPUlMKKy8vICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UCisvLyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKy8vIEEgUEFSVElDVUxBUiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisv LyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwKKy8vIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKy8vIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9G IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorLy8gREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZCisvLyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUCisvLyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKy8vIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKKyNp bmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJDU1NBdFJ1bGVJRC5oIgorCituYW1lc3BhY2Ug V2ViQ29yZSB7CisKK0NTU0F0UnVsZUlEIGNzc0F0UnVsZUlEKFN0cmluZ1ZpZXcgbmFtZSkKK3sK KyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuYW1lLCAiY2hhcnNldCIpKQorICAgICAg ICByZXR1cm4gQ1NTQXRSdWxlQ2hhcnNldDsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2Fz ZShuYW1lLCAiZm9udC1mYWNlIikpCisgICAgICAgIHJldHVybiBDU1NBdFJ1bGVGb250RmFjZTsK KyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuYW1lLCAiaW1wb3J0IikpCisgICAgICAg IHJldHVybiBDU1NBdFJ1bGVJbXBvcnQ7CisgICAgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2Uo bmFtZSwgImtleWZyYW1lcyIpKQorICAgICAgICByZXR1cm4gQ1NTQXRSdWxlS2V5ZnJhbWVzOwor ICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsICJtZWRpYSIpKQorICAgICAgICBy ZXR1cm4gQ1NTQXRSdWxlTWVkaWE7CisgICAgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2UobmFt ZSwgIm5hbWVzcGFjZSIpKQorICAgICAgICByZXR1cm4gQ1NTQXRSdWxlTmFtZXNwYWNlOworICAg IGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsICJwYWdlIikpCisgICAgICAgIHJldHVy biBDU1NBdFJ1bGVQYWdlOworICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsICJz dXBwb3J0cyIpKQorICAgICAgICByZXR1cm4gQ1NTQXRSdWxlU3VwcG9ydHM7CisgICAgaWYgKGVx dWFsSWdub3JpbmdBU0NJSUNhc2UobmFtZSwgInZpZXdwb3J0IikpCisgICAgICAgIHJldHVybiBD U1NBdFJ1bGVWaWV3cG9ydDsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuYW1lLCAi LXdlYmtpdC1rZXlmcmFtZXMiKSkKKyAgICAgICAgcmV0dXJuIENTU0F0UnVsZVdlYmtpdEtleWZy YW1lczsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuYW1lLCAiYXBwbHkiKSkKKyAg ICAgICAgcmV0dXJuIENTU0F0UnVsZUFwcGx5OworICAgIHJldHVybiBDU1NBdFJ1bGVJbnZhbGlk OworfQorCit9IC8vIG5hbWVzcGFjZSBibGluaworCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU0F0UnVsZUlELmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NBdFJ1bGVJRC5oCShub25leGlzdGVudCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9w YXJzZXIvQ1NTQXRSdWxlSUQuaAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDU4IEBACisvLyBD b3B5cmlnaHQgMjAxNSBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K Ky8vIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisv LworLy8gUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisvLyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisvLyBtZXQ6CisvLworLy8gICAgKiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorLy8gbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorLy8gICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVz dCByZXByb2R1Y2UgdGhlIGFib3ZlCisvLyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisvLyBpbiB0aGUgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisvLyBkaXN0 cmlidXRpb24uCisvLyAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRo ZSBuYW1lcyBvZiBpdHMKKy8vIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9y IHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisvLyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQg c3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorLy8KKy8vIFRISVMgU09GVFdBUkUg SVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKy8v ICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UCisvLyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNI QU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKy8vIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisvLyBPV05FUiBPUiBD T05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwKKy8vIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QKKy8vIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorLy8gREFUQSwgT1IgUFJPRklUUzsgT1Ig QlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisvLyBUSEVP UlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUCisvLyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKy8vIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKKyNpZm5kZWYgQ1NTQXRS dWxlSURfaAorI2RlZmluZSBDU1NBdFJ1bGVJRF9oCisKKyNpbmNsdWRlIDx3dGYvdGV4dC9TdHJp bmdWaWV3Lmg+CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworZW51bSBDU1NBdFJ1bGVJRCB7Cisg ICAgQ1NTQXRSdWxlSW52YWxpZCA9IDAsCisKKyAgICBDU1NBdFJ1bGVDaGFyc2V0ID0gMSwKKyAg ICBDU1NBdFJ1bGVGb250RmFjZSA9IDIsCisgICAgQ1NTQXRSdWxlSW1wb3J0ID0gMywKKyAgICBD U1NBdFJ1bGVLZXlmcmFtZXMgPSA0LAorICAgIENTU0F0UnVsZU1lZGlhID0gNSwKKyAgICBDU1NB dFJ1bGVOYW1lc3BhY2UgPSA2LAorICAgIENTU0F0UnVsZVBhZ2UgPSA3LAorICAgIENTU0F0UnVs ZVN1cHBvcnRzID0gOCwKKyAgICBDU1NBdFJ1bGVWaWV3cG9ydCA9IDksCisKKyAgICBDU1NBdFJ1 bGVXZWJraXRLZXlmcmFtZXMgPSAxMCwKKyAgICBDU1NBdFJ1bGVBcHBseSA9IDExLAorfTsKKwor Q1NTQXRSdWxlSUQgY3NzQXRSdWxlSUQoU3RyaW5nVmlldyBuYW1lKTsKKworfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQorCisjZW5kaWYgLy8gQ1NTQXRSdWxlSURfaAo=