33249 2010-01-05 23:46:05 -0800 [Chromium] Expose more APIs to eliminate WebCore usage in Chromium. 2010-01-07 00:49:39 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd oldest_to_newest 177544 0 fishd 2010-01-05 23:46:05 -0800 [Chromium] Expose more APIs to eliminate WebCore usage in Chromium. Expose: LogNotYetImplemented.state GlyphPageTreeNode::treeGlyphPageCount() WebFrameImpl::liveObjectCount() 177545 1 45955 fishd 2010-01-05 23:49:31 -0800 Created attachment 45955 v1 patch 177546 2 45955 abarth 2010-01-05 23:53:42 -0800 Comment on attachment 45955 v1 patch Looks reasonable. The WebKit API has a lot of statics, but I guess there is only one WebKit per process. 177547 3 fishd 2010-01-05 23:55:06 -0800 > The WebKit API has a lot of statics, but I guess there is only one WebKit per > process. Yeah... just like WebCore actually :-) 178058 4 fishd 2010-01-07 00:49:39 -0800 Landed as http://trac.webkit.org/changeset/52851 45955 2010-01-05 23:49:31 -0800 2010-01-05 23:53:41 -0800 v1 patch wk_1.txt text/plain 10638 fishd SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1Mjg1MCkKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wMS0wNSAgRGFy aW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gRXhwb3NlIG1vcmUgQVBJcyB0byBl bGltaW5hdGUgV2ViQ29yZSB1c2FnZSBpbiBDaHJvbWl1bS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMjQ5CisKKyAgICAgICAgKiBXZWJLaXQuZ3lw OgorICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZS5oOgorICAgICAgICAqIHB1YmxpYy9XZWJHbHlw aENhY2hlLmg6IEFkZGVkLgorICAgICAgICAqIHB1YmxpYy9XZWJLaXQuaDoKKyAgICAgICAgKiBz cmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6Omluc3RhbmNl Q291bnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OldlYkZyYW1lSW1wbCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6fldlYkZyYW1lSW1wbCk6CisgICAgICAgICog c3JjL1dlYkZyYW1lSW1wbC5oOgorICAgICAgICAqIHNyYy9XZWJHbHlwaENhY2hlLmNwcDogQWRk ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkdseXBoQ2FjaGU6OnBhZ2VDb3VudCk6CisgICAgICAg ICogc3JjL1dlYktpdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OmVuYWJsZUxvZ0NoYW5uZWwpOgor CiAyMDEwLTAxLTA1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL1dlYktp dC5neXANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkocmV2aXNp b24gNTI4NTApCisrKyBXZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAkod29ya2luZyBjb3B5KQpA QCAtMTIzLDYgKzEyMyw3IEBACiAgICAgICAgICAgICAgICAgJ3B1YmxpYy9XZWJGcmFtZUNsaWVu dC5oJywKICAgICAgICAgICAgICAgICAncHVibGljL1dlYkZvbnRDYWNoZS5oJywKICAgICAgICAg ICAgICAgICAncHVibGljL1dlYkZvcm1FbGVtZW50LmgnLAorICAgICAgICAgICAgICAgICdwdWJs aWMvV2ViR2x5cGhDYWNoZS5oJywKICAgICAgICAgICAgICAgICAncHVibGljL1dlYkhpc3RvcnlJ dGVtLmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViSFRUUEJvZHkuaCcsCiAgICAgICAg ICAgICAgICAgJ3B1YmxpYy9XZWJJbWFnZS5oJywKQEAgLTI3Miw2ICsyNzMsNyBAQAogICAgICAg ICAgICAgICAgICdzcmMvV2ViRm9ybUVsZW1lbnQuY3BwJywKICAgICAgICAgICAgICAgICAnc3Jj L1dlYkZyYW1lSW1wbC5jcHAnLAogICAgICAgICAgICAgICAgICdzcmMvV2ViRnJhbWVJbXBsLmgn LAorICAgICAgICAgICAgICAgICdzcmMvV2ViR2x5cGhDYWNoZS5jcHAnLAogICAgICAgICAgICAg ICAgICdzcmMvV2ViSGlzdG9yeUl0ZW0uY3BwJywKICAgICAgICAgICAgICAgICAnc3JjL1dlYkhU VFBCb2R5LmNwcCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJJbWFnZUNHLmNwcCcsCkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgNCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgJKHJldmlzaW9uIDUyODUwKQorKysgV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02OSw2ICs2OSw5 IEBAIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBjbGFzcyBXZWJWZWN0b3I7CiAKIGNsYXNzIFdlYkZy YW1lIHsKIHB1YmxpYzoKKyAgICAvLyBSZXR1cm5zIHRoZSBudW1iZXIgb2YgbGl2ZSBXZWJGcmFt ZSBvYmplY3RzLCB1c2VkIGZvciBsZWFrIGNoZWNraW5nLgorICAgIFdFQktJVF9BUEkgc3RhdGlj IGludCBpbnN0YW5jZUNvdW50KCk7CisKICAgICAvLyBUaGUgdHdvIGZ1bmN0aW9ucyBiZWxvdyBy ZXRyaWV2ZSB0aGUgV2ViRnJhbWUgaW5zdGFuY2VzIHJlbGF0aW5nIHRoZQogICAgIC8vIGN1cnJl bnRseSBleGVjdXRpbmcgSmF2YVNjcmlwdC4gIFNpbmNlIEphdmFTY3JpcHQgY2FuIG1ha2UgZnVu Y3Rpb24KICAgICAvLyBjYWxscyBhY3Jvc3MgZnJhbWVzLCB0aG91Z2gsIHdlIG5lZWQgdG8gYmUg bW9yZSBwcmVjaXNlLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJHbHlwaENhY2hl LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdseXBoQ2FjaGUu aAkocmV2aXNpb24gMCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViR2x5cGhDYWNoZS5o CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUxIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEw IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAg ICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAq IE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAq IGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMg ZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3Jp dHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhF IENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1J VEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAq IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBU SU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBX SEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBXZWJHbHlwaENhY2hlX2gKKyNk ZWZpbmUgV2ViR2x5cGhDYWNoZV9oCisKKyNpbmNsdWRlICJXZWJDb21tb24uaCIKKworbmFtZXNw YWNlIFdlYktpdCB7CisKKy8vIEFuIGludGVyZmFjZSB0byBxdWVyeSBXZWJLaXQncyBnbHlwaCBj YWNoZSAod2hpY2ggbWFwcyB1bmljb2RlIGNoYXJhY3RlcnMgdG8KKy8vIGdseXBocyBpbiBwYXJ0 aWN1bGFyIGZvbnRzKS4KK2NsYXNzIFdlYkdseXBoQ2FjaGUgeworcHVibGljOgorICAgIC8vIFJl dHVybnMgdGhlIG51bWJlciBvZiBwYWdlcyBpbiB0aGUgZ2x5cGggY2FjaGUuCisgICAgV0VCS0lU X0FQSSBzdGF0aWMgc2l6ZV90IHBhZ2VDb3VudCgpOworCitwcml2YXRlOgorICAgIFdlYkdseXBo Q2FjaGUoKTsgIC8vIE5vdCBpbnRlbmRlZCB0byBiZSBpbnN0YW5jZWQuCit9OworCit9ICAvLyBu YW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZgoNClByb3BlcnR5IGNoYW5nZXMgb246IFdlYktpdFxj aHJvbWl1bVxwdWJsaWNcV2ViR2x5cGhDYWNoZS5oDQpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fDQpBZGRlZDogc3ZuOmVv bC1zdHlsZQ0KICAgKyBMRg0KDQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJLaXQu aA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViS2l0LmgJKHJldmlz aW9uIDUyODUwKQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJLaXQuaAkod29ya2luZyBj b3B5KQpAQCAtNTUsNiArNTUsOSBAQCBXRUJLSVRfQVBJIFdlYktpdENsaWVudCogd2ViS2l0Q2xp ZW50KCk7CiBXRUJLSVRfQVBJIHZvaWQgc2V0TGF5b3V0VGVzdE1vZGUoYm9vbCk7CiBXRUJLSVRf QVBJIGJvb2wgbGF5b3V0VGVzdE1vZGUoKTsKIAorLy8gRW5hYmxlcyB0aGUgbmFtZWQgbG9nIGNo YW5uZWwuICBTZWUgV2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5nLmggZm9yIGRldGFpbHMuCitXRUJL SVRfQVBJIHZvaWQgZW5hYmxlTG9nQ2hhbm5lbChjb25zdCBjaGFyKik7CisKIC8vIFB1cmdlIHRo ZSBwbHVnaW4gbGlzdCBjYWNoZS4gSWYgfHJlbG9hZFBhZ2VzfCBpcyB0cnVlLCBhbnkgcGFnZXMK IC8vIGNvbnRhaW5pbmcgcGx1Z2lucyB3aWxsIGJlIHJlbG9hZGVkIGFmdGVyIHJlZnJlc2hpbmcg dGhlIHBsdWdpbiBsaXN0LgogV0VCS0lUX0FQSSB2b2lkIHJlc2V0UGx1Z2luQ2FjaGUoYm9vbCBy ZWxvYWRQYWdlcyk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAJKHJl dmlzaW9uIDUyODUwKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTcsNiArMTU3LDggQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7 CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitzdGF0aWMgaW50IGZyYW1lQ291bnQgPSAwOworCiAv LyBLZXkgZm9yIGEgU3RhdHNDb3VudGVyIHRyYWNraW5nIGhvdyBtYW55IFdlYkZyYW1lcyBhcmUg YWN0aXZlLgogc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IHdlYkZyYW1lQWN0aXZlQ291bnQgPSAi V2ViRnJhbWVBY3RpdmVDb3VudCI7CiAKQEAgLTMzMiw2ICszMzQsMTEgQEAgcHJpdmF0ZToKIAog Ly8gV2ViRnJhbWUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCitpbnQgV2ViRnJhbWU6Omluc3RhbmNlQ291bnQoKQor eworICAgIHJldHVybiBmcmFtZUNvdW50OworfQorCiBXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1l Rm9yRW50ZXJlZENvbnRleHQoKQogewogICAgIEZyYW1lKiBmcmFtZSA9CkBAIC0xNDkyLDggKzE0 OTksNiBAQCBXZWJTdHJpbmcgV2ViRnJhbWVJbXBsOjpjb3VudGVyVmFsdWVGb3JFCiAKIC8vIFdl YkZyYW1lSW1wbCBwdWJsaWMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAKLWludCBXZWJGcmFtZUltcGw6Om1fbGl2ZU9iamVjdENvdW50 ID0gMDsKLQogUGFzc1JlZlB0cjxXZWJGcmFtZUltcGw+IFdlYkZyYW1lSW1wbDo6Y3JlYXRlKFdl YkZyYW1lQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJGcmFt ZUltcGwoY2xpZW50KSk7CkBAIC0xNTE0LDEzICsxNTE5LDEzIEBAIFdlYkZyYW1lSW1wbDo6V2Vi RnJhbWVJbXBsKFdlYkZyYW1lQ2xpZW4KICAgICAsIG1fYW5pbWF0aW9uQ29udHJvbGxlcih0aGlz KQogewogICAgIENocm9taXVtQnJpZGdlOjppbmNyZW1lbnRTdGF0c0NvdW50ZXIod2ViRnJhbWVB Y3RpdmVDb3VudCk7Ci0gICAgbV9saXZlT2JqZWN0Q291bnQrKzsKKyAgICBmcmFtZUNvdW50Kys7 CiB9CiAKIFdlYkZyYW1lSW1wbDo6fldlYkZyYW1lSW1wbCgpCiB7CiAgICAgQ2hyb21pdW1Ccmlk Z2U6OmRlY3JlbWVudFN0YXRzQ291bnRlcih3ZWJGcmFtZUFjdGl2ZUNvdW50KTsKLSAgICBtX2xp dmVPYmplY3RDb3VudC0tOworICAgIGZyYW1lQ291bnQtLTsKIAogICAgIGNhbmNlbFBlbmRpbmdT Y29waW5nRWZmb3J0KCk7CiAgICAgY2xlYXJQYXNzd29yZExpc3RlbmVycygpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9j aHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHJldmlzaW9uIDUyODUwKQorKysgV2ViS2l0L2No cm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTY3LDggKzE2Nyw2 IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJGcmFtZUltcGw+IGNyZWF0ZShX ZWJGcmFtZUNsaWVudCogY2xpZW50KTsKICAgICB+V2ViRnJhbWVJbXBsKCk7CiAKLSAgICBzdGF0 aWMgaW50IGxpdmVPYmplY3RDb3VudCgpIHsgcmV0dXJuIG1fbGl2ZU9iamVjdENvdW50OyB9Ci0K ICAgICAvLyBDYWxsZWQgYnkgdGhlIFdlYlZpZXdJbXBsIHRvIGluaXRpYWxpemUgaXRzIG1haW4g ZnJhbWU6CiAgICAgdm9pZCBpbml0aWFsaXplQXNNYWluRnJhbWUoV2ViVmlld0ltcGwqKTsKIApA QCAtMjgzLDkgKzI4MSw2IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvYWRKYXZhU2NyaXB0VVJM KGNvbnN0IFdlYkNvcmU6OktVUkwmKTsKIAotICAgIC8vIFVzZWQgdG8gY2hlY2sgZm9yIGxlYWtz IG9mIHRoaXMgb2JqZWN0LgotICAgIHN0YXRpYyBpbnQgbV9saXZlT2JqZWN0Q291bnQ7Ci0KICAg ICBGcmFtZUxvYWRlckNsaWVudEltcGwgbV9mcmFtZUxvYWRlckNsaWVudDsKIAogICAgIFdlYkZy YW1lQ2xpZW50KiBtX2NsaWVudDsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR2x5cGhD YWNoZS5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdseXBoQ2Fj aGUuY3BwCShyZXZpc2lvbiAwKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHbHlwaENhY2hl LmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0NSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoKKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBkaXN0cmlidXRpb24uCisgKiAg ICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRz CisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1 Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9y IHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICog TElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFM LCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U CisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElU WSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNp bmNsdWRlICJXZWJHbHlwaENhY2hlLmgiCisKKyNpbmNsdWRlICJHbHlwaFBhZ2VUcmVlTm9kZS5o IgorCit1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK3Np emVfdCBXZWJHbHlwaENhY2hlOjpwYWdlQ291bnQoKQoreworICAgIHJldHVybiBHbHlwaFBhZ2VU cmVlTm9kZTo6dHJlZUdseXBoUGFnZUNvdW50KCk7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYktp dAoNClByb3BlcnR5IGNoYW5nZXMgb246IFdlYktpdFxjaHJvbWl1bVxzcmNcV2ViR2x5cGhDYWNo ZS5jcHANCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18NCkFkZGVkOiBzdm46ZW9sLXN0eWxlDQogICArIExGDQoNCkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYktpdC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYktpdC5jcHAJKHJldmlzaW9uIDUyODUwKQorKysgV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJLaXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCwxMyBAQCBib29s IGxheW91dFRlc3RNb2RlKCkKICAgICByZXR1cm4gc19sYXlvdXRUZXN0TW9kZTsKIH0KIAordm9p ZCBlbmFibGVMb2dDaGFubmVsKGNvbnN0IGNoYXIqIG5hbWUpCit7CisgICAgV1RGTG9nQ2hhbm5l bCogY2hhbm5lbCA9IFdlYkNvcmU6OmdldENoYW5uZWxGcm9tTmFtZShuYW1lKTsKKyAgICBpZiAo Y2hhbm5lbCkKKyAgICAgICAgY2hhbm5lbC0+c3RhdGUgPSBXVEZMb2dDaGFubmVsT247Cit9CisK IHZvaWQgcmVzZXRQbHVnaW5DYWNoZShib29sIHJlbG9hZFBhZ2VzKQogewogICAgIFdlYkNvcmU6 OlBhZ2U6OnJlZnJlc2hQbHVnaW5zKHJlbG9hZFBhZ2VzKTsK