84969 2012-04-26 09:08:32 -0700 Implement StyleSheetInternal copying 2012-04-26 11:44:26 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77745 1 koivisto webkit-unassigned kling macpherson menard webkit.review.bot oldest_to_newest 610668 0 koivisto 2012-04-26 09:08:32 -0700 We need to be able to copy stylesheets to cache them. Copying is already implement for most of the stylesheet data types but StyleSheetInternal::copy() is still missing. 610718 1 139025 koivisto 2012-04-26 10:37:08 -0700 Created attachment 139025 patch 610725 2 139025 webkit-ews 2012-04-26 10:49:05 -0700 Comment on attachment 139025 patch Attachment 139025 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12525915 610754 3 139025 kling 2012-04-26 11:21:09 -0700 Comment on attachment 139025 patch View in context: https://bugs.webkit.org/attachment.cgi?id=139025&action=review r=me with GCC appeased somehow. > Source/WebCore/ChangeLog:8 > + We need to be able to copy stylesheets to cache them. Copying is already implement for Typo, implemented. > Source/WebCore/ChangeLog:28 > + Add equality comparison operator to CSSParseMode. This will be needed to determine Typo CSSParserMode. 610776 4 koivisto 2012-04-26 11:44:26 -0700 http://trac.webkit.org/changeset/115336 (with a build fix) 139025 2012-04-26 10:37:08 -0700 2012-04-26 11:21:09 -0700 patch stylesheet-copy-7.patch text/plain 13281 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTMyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUzIEBACisyMDEyLTA0LTI2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1lbnQgU3R5bGVTaGVl dEludGVybmFsIGNvcHlpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg0OTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2UgbmVlZCB0byBiZSBhYmxlIHRvIGNvcHkgc3R5bGVzaGVldHMgdG8gY2FjaGUg dGhlbS4gQ29weWluZyBpcyBhbHJlYWR5IGltcGxlbWVudCBmb3IKKyAgICAgICAgbW9zdCBvZiB0 aGUgc3R5bGVzaGVldCBkYXRhIHR5cGVzIGJ1dCBTdHlsZVNoZWV0SW50ZXJuYWw6OmNvcHkoKSBp cyBzdGlsbCBtaXNzaW5nLgorICAgICAgICAKKyAgICAgICAgUHJlcGFyYXRpb24gZm9yIHN0eWxl c2hlZXQgY2FjaGluZy4gVGhlIGNvcHlpbmcgY29kZSBpcyBub3QgdXNlZCB5ZXQuCisKKyAgICAg ICAgKiBjc3MvQ1NTTmFtZXNwYWNlLmg6CisgICAgICAgIAorICAgICAgICAgICAgSW5zdGVhZCBv ZiBtYWtpbmcgaXQgY29weWFibGUsIHJlbW92ZSBDU1NOYW1lc3BhY2UgY2xhc3MuCisgICAgCisg ICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcj09 KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjphZGRO YW1lc3BhY2UpOgorICAgICAgICAKKyAgICAgICAgICAgIEF2b2lkIHBpbmctcG9uZ2luZyB0byBT dHlsZVNoZWV0SW50ZXJuYWwgYW5kIGJhY2sgdG8gc2V0IHRoZSBkZWZhdWx0IG5hbWVzcGFjZS4K KworICAgICAgICAqIGNzcy9DU1NQYXJzZXJNb2RlLmg6CisgICAgICAgIChXZWJDb3JlKToKKyAg ICAgICAgKFdlYkNvcmU6Om9wZXJhdG9yIT0pOgorCisgICAgICAgICAgICBBZGQgZXF1YWxpdHkg Y29tcGFyaXNvbiBvcGVyYXRvciB0byBDU1NQYXJzZU1vZGUuIFRoaXMgd2lsbCBiZSBuZWVkZWQg dG8gZGV0ZXJtaW5lCisgICAgICAgICAgICBpZiBhIGNhY2hlZCBjb3B5IGNhbiBiZSB1c2VkLgor ICAgICAgICAgICAgCisgICAgICAgICogY3NzL0NTU1N0eWxlU2hlZXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGVTaGVldEludGVybmFsOjpTdHlsZVNoZWV0SW50ZXJuYWwpOgorICAgICAg ICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVNoZWV0SW50ZXJuYWw6OmlzQ2Fj aGVhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlU2hlZXRJbnRlcm5hbDo6cGFyc2VyQWRk TmFtZXNwYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlU2hlZXRJbnRlcm5hbDo6ZGV0ZXJt aW5lTmFtZXNwYWNlKToKKyAgICAgICAgCisgICAgICAgICAgICBVc2UgSGFzaE1hcCBpbnN0ZWFk IG9mIGl0ZXJhdGluZyBhIGxpbmtlZCBsaXN0IG9mIENTU05hbWVzcGFjZXMuCisKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlU2hlZXRJbnRlcm5hbDo6c3R5bGVTaGVldENoYW5nZWQpOgorICAgICAg ICAKKyAgICAgICAgICAgIEFkZCBtdXRhdGlvbiBiaXQuCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5 bGVTaGVldC5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChTdHlsZVNoZWV0SW50ZXJu YWwpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVldEludGVybmFsOjpjb3B5KToKKyAgICAg ICAgCisgICAgICAgICAgICBDb3B5IGNvbnN0cnVjdG9yLiBJdCBvbmx5IHVzYWJsZSBmb3IgY2Fj aGVhYmxlIHN0eWxlc2hlZXRzLgorCiAyMDEyLTA0LTI2ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wbGVtZW50IHRo ZSAiRGlzYWJsZSBKYXZhU2NyaXB0IiBvcHRpb24gaW4gdGhlIHNldHRpbmdzIGRpYWxvZwpJbmRl eDogU291cmNlL1dlYkNvcmUvY3NzL0NTU05hbWVzcGFjZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NOYW1lc3BhY2UuaAkocmV2aXNpb24gMTE1Mjk4KQorKysgU291cmNl L1dlYkNvcmUvY3NzL0NTU05hbWVzcGFjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDU1ICsxIEBA Ci0vKgotICogQ29weXJpZ2h0IChDKSAxOTk5LTIwMDMgTGFycyBLbm9sbCAoa25vbGxAa2RlLm9y ZykKLSAqICAgICAgICAgICAgICAgMTk5OSBXYWxkbyBCYXN0aWFuIChiYXN0aWFuQGtkZS5vcmcp Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDYsIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgotICoKLSAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2Fu IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKLSAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2Yg dGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCi0gKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBi eSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKLSAqIHZlcnNpb24gMiBvZiB0 aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KLSAqCi0g KiBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJl IHVzZWZ1bCwKLSAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBp bXBsaWVkIHdhcnJhbnR5IG9mCi0gKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQotICogTGlicmFyeSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCi0gKgotICogWW91IHNob3VsZCBoYXZlIHJlY2Vp dmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQotICog YWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5v dCwgd3JpdGUgdG8KLSAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZy YW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCi0gKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVT QS4KLSAqLwotCi0jaWZuZGVmIENTU05hbWVzcGFjZV9oCi0jZGVmaW5lIENTU05hbWVzcGFjZV9o Ci0KLSNpbmNsdWRlIDx3dGYvdGV4dC9BdG9taWNTdHJpbmcuaD4KLQotbmFtZXNwYWNlIFdlYkNv cmUgewotCi0gICAgc3RydWN0IENTU05hbWVzcGFjZSB7Ci0gICAgICAgIFdURl9NQUtFX05PTkNP UFlBQkxFKENTU05hbWVzcGFjZSk7IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwotICAgIHB1Ymxp YzoKLSAgICAgICAgQXRvbWljU3RyaW5nIHByZWZpeDsKLSAgICAgICAgQXRvbWljU3RyaW5nIHVy aTsKLSAgICAgICAgT3duUHRyPENTU05hbWVzcGFjZT4gcGFyZW50OwotCi0gICAgICAgIENTU05h bWVzcGFjZShjb25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiB1 cmksIFBhc3NPd25QdHI8Q1NTTmFtZXNwYWNlPiBwYXJlbnQpCi0gICAgICAgICAgICA6IHByZWZp eChwcmVmaXgpCi0gICAgICAgICAgICAsIHVyaSh1cmkpCi0gICAgICAgICAgICAsIHBhcmVudChw YXJlbnQpCi0gICAgICAgIHsKLSAgICAgICAgfQotCi0gICAgICAgIENTU05hbWVzcGFjZSogbmFt ZXNwYWNlRm9yUHJlZml4KGNvbnN0IEF0b21pY1N0cmluZyYgcHJlZml4KQotICAgICAgICB7Ci0g ICAgICAgICAgICBmb3IgKENTU05hbWVzcGFjZSogY2FuZGlkYXRlID0gdGhpczsgY2FuZGlkYXRl OyBjYW5kaWRhdGUgPSBjYW5kaWRhdGUtPnBhcmVudC5nZXQoKSkgewotICAgICAgICAgICAgICAg IGlmIChjYW5kaWRhdGUtPnByZWZpeCA9PSBwcmVmaXgpCi0gICAgICAgICAgICAgICAgICAgIHJl dHVybiBjYW5kaWRhdGU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gMDsKLSAg ICAgICAgfQotICAgIH07Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2VuZGlmIC8vIENT U05hbWVzcGFjZV9oCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgZmlsZS4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQYXJzZXIuY3BwCShyZXZpc2lvbiAxMTUyOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA0LDYgKzIwNCwxOCBAQCBDU1NQYXJz ZXJDb250ZXh0OjpDU1NQYXJzZXJDb250ZXh0KERvY3VtCiB7CiB9CiAKK2Jvb2wgb3BlcmF0b3I9 PShjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBhLCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBiKQor eworICAgIHJldHVybiBhLmJhc2VVUkwgPT0gYi5iYXNlVVJMCisgICAgICAgICYmIGEuY2hhcnNl dCA9PSBiLmNoYXJzZXQKKyAgICAgICAgJiYgYS5tb2RlID09IGIubW9kZQorICAgICAgICAmJiBh LmlzSFRNTERvY3VtZW50ID09IGIuaXNIVE1MRG9jdW1lbnQKKyAgICAgICAgJiYgYS5pc0NTU0N1 c3RvbUZpbHRlckVuYWJsZWQgPT0gYi5pc0NTU0N1c3RvbUZpbHRlckVuYWJsZWQKKyAgICAgICAg JiYgYS5pc0NTU1JlZ2lvbnNFbmFibGVkID09IGIuaXNDU1NSZWdpb25zRW5hYmxlZAorICAgICAg ICAmJiBhLm5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzID09IGIubmVlZHNTaXRlU3BlY2lmaWNRdWly a3MKKyAgICAgICAgJiYgYS5lbmZvcmNlc0NTU01JTUVUeXBlSW5Ob1F1aXJrc01vZGUgPT0gYi5l bmZvcmNlc0NTU01JTUVUeXBlSW5Ob1F1aXJrc01vZGU7Cit9CisKIENTU1BhcnNlcjo6Q1NTUGFy c2VyKGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRleHQpCiAgICAgOiBtX2NvbnRleHQoY29u dGV4dCkKICAgICAsIG1faW1wb3J0YW50KGZhbHNlKQpAQCAtOTA3NSw3ICs5MDg3LDkgQEAgdm9p ZCBDU1NQYXJzZXI6OmFkZE5hbWVzcGFjZShjb25zdCBBdG9taQogICAgIGlmICghbV9zdHlsZVNo ZWV0IHx8ICFtX2FsbG93TmFtZXNwYWNlRGVjbGFyYXRpb25zKQogICAgICAgICByZXR1cm47CiAg ICAgbV9hbGxvd0ltcG9ydFJ1bGVzID0gZmFsc2U7Ci0gICAgbV9zdHlsZVNoZWV0LT5hZGROYW1l c3BhY2UodGhpcywgcHJlZml4LCB1cmkpOworICAgIG1fc3R5bGVTaGVldC0+cGFyc2VyQWRkTmFt ZXNwYWNlKHByZWZpeCwgdXJpKTsKKyAgICBpZiAocHJlZml4LmlzRW1wdHkoKSAmJiAhdXJpLmlz TnVsbCgpKQorICAgICAgICBtX2RlZmF1bHROYW1lc3BhY2UgPSB1cmk7CiB9CiAKIHZvaWQgQ1NT UGFyc2VyOjp1cGRhdGVTcGVjaWZpZXJzV2l0aEVsZW1lbnROYW1lKGNvbnN0IEF0b21pY1N0cmlu ZyYgbmFtZXNwYWNlUHJlZml4LCBjb25zdCBBdG9taWNTdHJpbmcmIGVsZW1lbnROYW1lLCBDU1NQ YXJzZXJTZWxlY3Rvciogc3BlY2lmaWVycykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ YXJzZXJNb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlck1v ZGUuaAkocmV2aXNpb24gMTE1Mjk4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlck1v ZGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsOSBAQCBzdHJ1Y3QgQ1NTUGFyc2VyQ29u dGV4dCB7CiAgICAgYm9vbCBlbmZvcmNlc0NTU01JTUVUeXBlSW5Ob1F1aXJrc01vZGU7CiB9Owog Citib29sIG9wZXJhdG9yPT0oY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYsIGNvbnN0IENTU1BhcnNl ckNvbnRleHQmKTsKK2lubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgQ1NTUGFyc2VyQ29udGV4 dCYgYSwgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYgYikgeyByZXR1cm4gIShhID09IGIpOyB9CisK IGNvbnN0IENTU1BhcnNlckNvbnRleHQmIHN0cmljdENTU1BhcnNlckNvbnRleHQoKTsKIAogfTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNoZWV0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAJKHJldmlzaW9uIDExNTI5OCkK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNoZWV0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjQsNyArMjQsNiBAQAogI2luY2x1ZGUgIkNTU0NoYXJzZXRSdWxlLmgiCiAjaW5jbHVkZSAi Q1NTRm9udEZhY2VSdWxlLmgiCiAjaW5jbHVkZSAiQ1NTSW1wb3J0UnVsZS5oIgotI2luY2x1ZGUg IkNTU05hbWVzcGFjZS5oIgogI2luY2x1ZGUgIkNTU1BhcnNlci5oIgogI2luY2x1ZGUgIkNTU1J1 bGVMaXN0LmgiCiAjaW5jbHVkZSAiQ1NTU3R5bGVSdWxlLmgiCkBAIC04MiwxNSArODEsNjMgQEAg U3R5bGVTaGVldEludGVybmFsOjpTdHlsZVNoZWV0SW50ZXJuYWwoUwogICAgICwgbV9oYXNTeW50 YWN0aWNhbGx5VmFsaWRDU1NIZWFkZXIodHJ1ZSkKICAgICAsIG1fZGlkTG9hZEVycm9yT2NjdXIo ZmFsc2UpCiAgICAgLCBtX3VzZXNSZW1Vbml0cyhmYWxzZSkKKyAgICAsIG1faGFzTXV0YXRlZChm YWxzZSkKICAgICAsIG1fcGFyc2VyQ29udGV4dChjb250ZXh0KQogewogfQogCitTdHlsZVNoZWV0 SW50ZXJuYWw6OlN0eWxlU2hlZXRJbnRlcm5hbChjb25zdCBTdHlsZVNoZWV0SW50ZXJuYWwmIG8p CisgICAgOiBtX293bmVyUnVsZSgwKQorICAgICwgbV9vcmlnaW5hbFVSTChvLm1fb3JpZ2luYWxV UkwpCisgICAgLCBtX2ZpbmFsVVJMKG8ubV9maW5hbFVSTCkKKyAgICAsIG1fdGl0bGUoby5tX3Rp dGxlKQorICAgICwgbV9lbmNvZGluZ0Zyb21DaGFyc2V0UnVsZShvLm1fZW5jb2RpbmdGcm9tQ2hh cnNldFJ1bGUpCisgICAgLCBtX2ltcG9ydFJ1bGVzKG8ubV9pbXBvcnRSdWxlcy5zaXplKCkpCisg ICAgLCBtX2NoaWxkUnVsZXMoby5tX2NoaWxkUnVsZXMuc2l6ZSgpKQorICAgICwgbV9uYW1lc3Bh Y2VzKG8ubV9uYW1lc3BhY2VzKQorICAgICwgbV9tZWRpYVF1ZXJpZXMoby5tX21lZGlhUXVlcmll cyA/IG8ubV9tZWRpYVF1ZXJpZXMtPmNvcHkoKSA6IDApCisgICAgLCBtX2xvYWRDb21wbGV0ZWQo dHJ1ZSkKKyAgICAsIG1faXNVc2VyU3R5bGVTaGVldChvLm1faXNVc2VyU3R5bGVTaGVldCkKKyAg ICAsIG1faGFzU3ludGFjdGljYWxseVZhbGlkQ1NTSGVhZGVyKG8ubV9oYXNTeW50YWN0aWNhbGx5 VmFsaWRDU1NIZWFkZXIpCisgICAgLCBtX2RpZExvYWRFcnJvck9jY3VyKGZhbHNlKQorICAgICwg bV91c2VzUmVtVW5pdHMoby5tX3VzZXNSZW1Vbml0cykKKyAgICAsIG1faGFzTXV0YXRlZChmYWxz ZSkKKyAgICAsIG1fcGFyc2VyQ29udGV4dChvLm1fcGFyc2VyQ29udGV4dCkKK3sKKyAgICBBU1NF UlQoby5pc0NhY2hlYWJsZSgpKTsKKworICAgIC8vIEZJWE1FOiBDb3B5IGltcG9ydCBydWxlcy4K KyAgICBBU1NFUlQoby5tX2ltcG9ydFJ1bGVzLmlzRW1wdHkoKSk7CisKKyAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgbV9jaGlsZFJ1bGVzLnNpemUoKTsgKytpKQorICAgICAgICBtX2NoaWxk UnVsZXNbaV0gPSBvLm1fY2hpbGRSdWxlc1tpXS0+Y29weSgpOworfQorCiBTdHlsZVNoZWV0SW50 ZXJuYWw6On5TdHlsZVNoZWV0SW50ZXJuYWwoKQogewogICAgIGNsZWFyUnVsZXMoKTsKIH0KIAor Ym9vbCBTdHlsZVNoZWV0SW50ZXJuYWw6OmlzQ2FjaGVhYmxlKCkgY29uc3QKK3sKKyAgICAvLyBG SVhNRTogU3VwcG9ydCBjb3B5aW5nIGltcG9ydCBydWxlcy4KKyAgICBpZiAoIW1faW1wb3J0UnVs ZXMuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgLy8gVGhpcyB3b3VsZCBy ZXF1aXJlIGRlYWxpbmcgd2l0aCBtdWx0aXBsZSBjbGllbnRzIGZvciBsb2FkIGNhbGxiYWNrcy4K KyAgICBpZiAoIW1fbG9hZENvbXBsZXRlZCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlm IChtX2RpZExvYWRFcnJvck9jY3VyKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgLy8gSXQg aXMgbm90IHRoZSBvcmlnaW5hbCBzaGVldCBhbnltb3JlLgorICAgIGlmIChtX2hhc011dGF0ZWQp CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAvLyBJZiB0aGUgaGVhZGVyIGlzIHZhbGlkIHdl IGFyZSBub3QgZ29pbmcgdG8gbmVlZCB0byBjaGVjayB0aGUgU2VjdXJpdHlPcmlnaW4uCisgICAg Ly8gRklYTUU6IFZhbGlkIG1pbWUgdHlwZSBhdm9pZHMgdGhlIGNoZWNrIHRvby4KKyAgICBpZiAo IW1faGFzU3ludGFjdGljYWxseVZhbGlkQ1NTSGVhZGVyKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIHRydWU7Cit9CisKIHZvaWQgU3R5bGVTaGVldEludGVybmFsOjpwYXJzZXJB cHBlbmRSdWxlKFBhc3NSZWZQdHI8U3R5bGVSdWxlQmFzZT4gcnVsZSkKIHsKICAgICBBU1NFUlQo IXJ1bGUtPmlzQ2hhcnNldFJ1bGUoKSk7CkBAIC0yMTcsMTcgKzI2NCwxMSBAQCB2b2lkIFN0eWxl U2hlZXRJbnRlcm5hbDo6d3JhcHBlckRlbGV0ZVJ1CiAgICAgc3R5bGVTaGVldENoYW5nZWQoKTsK IH0KIAotdm9pZCBTdHlsZVNoZWV0SW50ZXJuYWw6OmFkZE5hbWVzcGFjZShDU1NQYXJzZXIqIHAs IGNvbnN0IEF0b21pY1N0cmluZyYgcHJlZml4LCBjb25zdCBBdG9taWNTdHJpbmcmIHVyaSkKK3Zv aWQgU3R5bGVTaGVldEludGVybmFsOjpwYXJzZXJBZGROYW1lc3BhY2UoY29uc3QgQXRvbWljU3Ry aW5nJiBwcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgdXJpKQogewotICAgIGlmICh1cmkuaXNO dWxsKCkpCisgICAgaWYgKHVyaS5pc051bGwoKSB8fCBwcmVmaXguaXNOdWxsKCkpCiAgICAgICAg IHJldHVybjsKLQotICAgIG1fbmFtZXNwYWNlcyA9IGFkb3B0UHRyKG5ldyBDU1NOYW1lc3BhY2Uo cHJlZml4LCB1cmksIG1fbmFtZXNwYWNlcy5yZWxlYXNlKCkpKTsKLQotICAgIGlmIChwcmVmaXgu aXNFbXB0eSgpKQotICAgICAgICAvLyBTZXQgdGhlIGRlZmF1bHQgbmFtZXNwYWNlIG9uIHRoZSBw YXJzZXIgc28gdGhhdCBzZWxlY3RvcnMgdGhhdCBvbWl0IG5hbWVzcGFjZSBpbmZvIHdpbGwKLSAg ICAgICAgLy8gYmUgYWJsZSB0byBwaWNrIGl0IHVwIGVhc2lseS4KLSAgICAgICAgcC0+bV9kZWZh dWx0TmFtZXNwYWNlID0gdXJpOworICAgIG1fbmFtZXNwYWNlcy5hZGQocHJlZml4LCB1cmkpOwog fQogCiBjb25zdCBBdG9taWNTdHJpbmcmIFN0eWxlU2hlZXRJbnRlcm5hbDo6ZGV0ZXJtaW5lTmFt ZXNwYWNlKGNvbnN0IEF0b21pY1N0cmluZyYgcHJlZml4KQpAQCAtMjM2LDExICsyNzcsMTAgQEAg Y29uc3QgQXRvbWljU3RyaW5nJiBTdHlsZVNoZWV0SW50ZXJuYWw6OgogICAgICAgICByZXR1cm4g bnVsbEF0b207IC8vIE5vIG5hbWVzcGFjZS4gSWYgYW4gZWxlbWVudC9hdHRyaWJ1dGUgaGFzIGEg bmFtZXNwYWNlLCB3ZSB3b24ndCBtYXRjaCBpdC4KICAgICBpZiAocHJlZml4ID09IHN0YXJBdG9t KQogICAgICAgICByZXR1cm4gc3RhckF0b207IC8vIFdlJ2xsIG1hdGNoIGFueSBuYW1lc3BhY2Uu Ci0gICAgaWYgKG1fbmFtZXNwYWNlcykgewotICAgICAgICBpZiAoQ1NTTmFtZXNwYWNlKiBuYW1l c3BhY2VGb3JQcmVmaXggPSBtX25hbWVzcGFjZXMtPm5hbWVzcGFjZUZvclByZWZpeChwcmVmaXgp KQotICAgICAgICAgICAgcmV0dXJuIG5hbWVzcGFjZUZvclByZWZpeC0+dXJpOwotICAgIH0KLSAg ICByZXR1cm4gbnVsbEF0b207IC8vIEFzc3VtZSB3ZSB3b24ndCBtYXRjaCBhbnkgbmFtZXNwYWNl cy4KKyAgICBIYXNoTWFwPEF0b21pY1N0cmluZywgQXRvbWljU3RyaW5nPjo6Y29uc3RfaXRlcmF0 b3IgaXQgPSBtX25hbWVzcGFjZXMuZmluZChwcmVmaXgpOworICAgIGlmIChpdCA9PSBtX25hbWVz cGFjZXMuZW5kKCkpCisgICAgICAgIHJldHVybiBudWxsQXRvbTsKKyAgICByZXR1cm4gaXQtPnNl Y29uZDsKIH0KIAogdm9pZCBTdHlsZVNoZWV0SW50ZXJuYWw6OnBhcnNlVXNlclN0eWxlU2hlZXQo Y29uc3QgQ2FjaGVkQ1NTU3R5bGVTaGVldCogY2FjaGVkU3R5bGVTaGVldCwgY29uc3QgU2VjdXJp dHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKQpAQCAtMzY1LDYgKzQwNSw4IEBAIHZvaWQgU3R5bGVT aGVldEludGVybmFsOjpzZXRNZWRpYVF1ZXJpZXMKIAogdm9pZCBTdHlsZVNoZWV0SW50ZXJuYWw6 OnN0eWxlU2hlZXRDaGFuZ2VkKCkKIHsKKyAgICBtX2hhc011dGF0ZWQgPSB0cnVlOworCiAgICAg RG9jdW1lbnQqIG93bmVyRG9jdW1lbnQgPSBzaW5nbGVPd25lckRvY3VtZW50KCk7CiAgICAgaWYg KCFvd25lckRvY3VtZW50KQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTU3R5bGVTaGVldC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNoZWV0LmgJKHJldmlzaW9uIDExNTI5OCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNoZWV0LmgJKHdvcmtpbmcgY29weSkKQEAgLTIzLDYgKzIzLDggQEAKIAogI2luY2x1ZGUg IkNTU1BhcnNlck1vZGUuaCIKICNpbmNsdWRlICJTdHlsZVNoZWV0LmgiCisjaW5jbHVkZSA8d3Rm L0hhc2hNYXAuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9BdG9taWNTdHJpbmdIYXNoLmg+CiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMzksNyArNDEsNiBAQCBjbGFzcyBNZWRpYVF1ZXJ5U2V0 OwogY2xhc3MgU2VjdXJpdHlPcmlnaW47CiBjbGFzcyBTdHlsZVJ1bGVCYXNlOwogY2xhc3MgU3R5 bGVSdWxlSW1wb3J0Owotc3RydWN0IENTU05hbWVzcGFjZTsKIAogdHlwZWRlZiBpbnQgRXhjZXB0 aW9uQ29kZTsKIApAQCAtNjIsNyArNjMsNiBAQCBwdWJsaWM6CiAgICAgCiAgICAgY29uc3QgQ1NT UGFyc2VyQ29udGV4dCYgcGFyc2VyQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyc2VyQ29u dGV4dDsgfQogCi0gICAgdm9pZCBhZGROYW1lc3BhY2UoQ1NTUGFyc2VyKiwgY29uc3QgQXRvbWlj U3RyaW5nJiBwcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgdXJpKTsKICAgICBjb25zdCBBdG9t aWNTdHJpbmcmIGRldGVybWluZU5hbWVzcGFjZShjb25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCk7 CiAKICAgICB2b2lkIHN0eWxlU2hlZXRDaGFuZ2VkKCk7CkBAIC03MSw2ICs3MSw4IEBAIHB1Ymxp YzoKICAgICBib29sIHBhcnNlU3RyaW5nKGNvbnN0IFN0cmluZyYpOwogICAgIGJvb2wgcGFyc2VT dHJpbmdBdExpbmUoY29uc3QgU3RyaW5nJiwgaW50IHN0YXJ0TGluZU51bWJlcik7CiAKKyAgICBi b29sIGlzQ2FjaGVhYmxlKCkgY29uc3Q7CisKICAgICBib29sIGlzTG9hZGluZygpIGNvbnN0Owog CiAgICAgdm9pZCBjaGVja0xvYWRlZCgpOwpAQCAtOTIsNiArOTQsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBzZXRIYXNTeW50YWN0aWNhbGx5VmFsaWRDU1NIZWFkZXIoYm9vbCBiKSB7IG1faGFzU3lu dGFjdGljYWxseVZhbGlkQ1NTSGVhZGVyID0gYjsgfQogICAgIGJvb2wgaGFzU3ludGFjdGljYWxs eVZhbGlkQ1NTSGVhZGVyKCkgY29uc3QgeyByZXR1cm4gbV9oYXNTeW50YWN0aWNhbGx5VmFsaWRD U1NIZWFkZXI7IH0KIAorICAgIHZvaWQgcGFyc2VyQWRkTmFtZXNwYWNlKGNvbnN0IEF0b21pY1N0 cmluZyYgcHJlZml4LCBjb25zdCBBdG9taWNTdHJpbmcmIHVyaSk7CiAgICAgdm9pZCBwYXJzZXJB cHBlbmRSdWxlKFBhc3NSZWZQdHI8U3R5bGVSdWxlQmFzZT4pOwogICAgIHZvaWQgcGFyc2VyU2V0 RW5jb2RpbmdGcm9tQ2hhcnNldFJ1bGUoY29uc3QgU3RyaW5nJiBlbmNvZGluZyk7IAogICAgIHZv aWQgcGFyc2VyU2V0VXNlc1JlbVVuaXRzKGJvb2wgYikgeyBtX3VzZXNSZW1Vbml0cyA9IGI7IH0K QEAgLTEzMCwxMiArMTMzLDE1IEBAIHB1YmxpYzoKIAogICAgIFBhc3NSZWZQdHI8Q1NTUnVsZT4g Y3JlYXRlQ2hpbGRSdWxlQ1NTT01XcmFwcGVyKHVuc2lnbmVkIGluZGV4LCBDU1NTdHlsZVNoZWV0 KiBwYXJlbnRXcmFwcGVyKTsKIAorICAgIFBhc3NSZWZQdHI8U3R5bGVTaGVldEludGVybmFsPiBj b3B5KCkgY29uc3QgeyByZXR1cm4gYWRvcHRSZWYobmV3IFN0eWxlU2hlZXRJbnRlcm5hbCgqdGhp cykpOyB9CisKICAgICB2b2lkIHJlZ2lzdGVyQ2xpZW50KENTU1N0eWxlU2hlZXQqKTsKICAgICB2 b2lkIHVucmVnaXN0ZXJDbGllbnQoQ1NTU3R5bGVTaGVldCopOwogCiBwcml2YXRlOgogICAgIFN0 eWxlU2hlZXRJbnRlcm5hbChTdHlsZVJ1bGVJbXBvcnQqIG93bmVyUnVsZSwgY29uc3QgU3RyaW5n JiBvcmlnaW5hbFVSTCwgY29uc3QgS1VSTCYgYmFzZVVSTCwgY29uc3QgQ1NTUGFyc2VyQ29udGV4 dCYpOwotICAgIAorICAgIFN0eWxlU2hlZXRJbnRlcm5hbChjb25zdCBTdHlsZVNoZWV0SW50ZXJu YWwmKTsKKwogICAgIHZvaWQgY2xlYXJDaGFyc2V0UnVsZSgpOwogICAgIGJvb2wgaGFzQ2hhcnNl dFJ1bGUoKSBjb25zdCB7IHJldHVybiAhbV9lbmNvZGluZ0Zyb21DaGFyc2V0UnVsZS5pc051bGwo KTsgfQogICAgIApAQCAtMTUwLDcgKzE1Niw3IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fZW5j b2RpbmdGcm9tQ2hhcnNldFJ1bGU7CiAgICAgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVJbXBvcnQ+ ID4gbV9pbXBvcnRSdWxlczsKICAgICBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+ID4gbV9j aGlsZFJ1bGVzOwotICAgIE93blB0cjxDU1NOYW1lc3BhY2U+IG1fbmFtZXNwYWNlczsKKyAgICBI YXNoTWFwPEF0b21pY1N0cmluZywgQXRvbWljU3RyaW5nPiBtX25hbWVzcGFjZXM7CiAgICAgUmVm UHRyPE1lZGlhUXVlcnlTZXQ+IG1fbWVkaWFRdWVyaWVzOwogCiAgICAgYm9vbCBtX2xvYWRDb21w bGV0ZWQgOiAxOwpAQCAtMTU4LDYgKzE2NCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc1N5 bnRhY3RpY2FsbHlWYWxpZENTU0hlYWRlciA6IDE7CiAgICAgYm9vbCBtX2RpZExvYWRFcnJvck9j Y3VyIDogMTsKICAgICBib29sIG1fdXNlc1JlbVVuaXRzIDogMTsKKyAgICBib29sIG1faGFzTXV0 YXRlZCA6IDE7CiAgICAgCiAgICAgQ1NTUGFyc2VyQ29udGV4dCBtX3BhcnNlckNvbnRleHQ7CiAK