41993 2010-07-09 14:45:36 -0700 WebKit API for WebInspector-Appcache integration for chrome. 2010-07-15 11:41:13 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 kkanetkar webkit-unassigned commit-queue fishd joepeck michaeln oldest_to_newest 249294 0 kkanetkar 2010-07-09 14:45:36 -0700 Related to : Bug 24529. 251432 1 61568 michaeln 2010-07-14 14:37:47 -0700 Created attachment 61568 WebKitAPI 251518 2 61568 fishd 2010-07-14 16:48:24 -0700 Comment on attachment 61568 WebKitAPI WebKit/chromium/public/WebApplicationCacheHost.h:96 + struct ApplicationCacheInfo { this struct is contained in the WebApplicationCacheHost "namespace" so the ApplicationCache prefix here is a bit redundant. however, just calling it Info seems too vague. maybe CacheInfo is enough since you use the method name getAssociatedCacheInfo? WebKit/chromium/public/WebApplicationCacheHost.h:97 + WebURL manifestUrl; // Empty if there is no associated cache. nit: manifestUrl -> manifestURL WebKit/chromium/public/WebApplicationCacheHost.h:113 + // FIXME: Make these pure virtual after chrome has caught up. Actually, our convention for WebKit API interfaces that are implemented by the embedder is that they should not have pure virtual methods. WebKit/chromium/public/WebApplicationCacheHostClient.h:43 + virtual void didChangeCacheAssociation() { return; } // FIXME: Make this pure virtual. this one can be pure virtual now since you can provide a dummy implementation in ApplicationCacheHostInternal.h. WebKit/chromium/public/WebApplicationCacheHost.h:114 + virtual void getAssociatedCacheInfo(ApplicationCacheInfo*) { return; } style-nit: no need for the return statements WebKit/chromium/public/WebApplicationCacheHost.h:116 + virtual void deleteAssociatedCacheGroup() { return; } it is unclear to me why this is called deleteAssociatedCacheGroup and not deleteAssociatedCache given the method named getAssociatedCacheInfo. 251523 3 michaeln 2010-07-14 16:58:13 -0700 Thnx for looking. (In reply to comment #2) > (From update of attachment 61568 [details]) > WebKit/chromium/public/WebApplicationCacheHost.h:96 > + struct ApplicationCacheInfo { > this struct is contained in the WebApplicationCacheHost "namespace" > so the ApplicationCache prefix here is a bit redundant. however, > just calling it Info seems too vague. maybe CacheInfo is enough > since you use the method name getAssociatedCacheInfo? CacheInfo it is! > WebKit/chromium/public/WebApplicationCacheHost.h:97 > + WebURL manifestUrl; // Empty if there is no associated cache. > nit: manifestUrl -> manifestURL will do > WebKit/chromium/public/WebApplicationCacheHost.h:113 > + // FIXME: Make these pure virtual after chrome has caught up. > Actually, our convention for WebKit API interfaces that are > implemented by the embedder is that they should not have pure > virtual methods. hmmm... then i suppose i should change all the others as well (yes?) > WebKit/chromium/public/WebApplicationCacheHostClient.h:43 > + virtual void didChangeCacheAssociation() { return; } // FIXME: Make this pure virtual. > this one can be pure virtual now since you can provide a dummy > implementation in ApplicationCacheHostInternal.h. ok, will do > WebKit/chromium/public/WebApplicationCacheHost.h:114 > + virtual void getAssociatedCacheInfo(ApplicationCacheInfo*) { return; } > style-nit: no need for the return statements duh > WebKit/chromium/public/WebApplicationCacheHost.h:116 > + virtual void deleteAssociatedCacheGroup() { return; } > it is unclear to me why this is called deleteAssociatedCacheGroup > and not deleteAssociatedCache given the method named > getAssociatedCacheInfo. Because the action will be to delete everything related to the manifestURL. In appcache speak, that's an ApplicationCacheGroup. I'd be ok with using deleteAssociatedCache shorthand here, but really the addition of "Group" is more descriptive. 251532 4 61586 michaeln 2010-07-14 17:19:27 -0700 Created attachment 61586 WebKitAPI with tweeks 251551 5 michaeln 2010-07-14 17:43:47 -0700 cc'ing joepeck too 251553 6 michaeln 2010-07-14 17:45:54 -0700 ... and fishd 251982 7 kkanetkar 2010-07-15 10:38:43 -0700 public/WebApplicationCacheHost.h 111 ResourceInfo() : size(0), isMaster(false), isManifest(false), isExplicit(false), isForeign(false), isFallback(false) { } ^^^ Can we add url to this ? 251994 8 kkanetkar 2010-07-15 11:10:25 -0700 Sorry, I meant can we add c'tor that assigns to members? Not a big deal. 252012 9 61586 commit-queue 2010-07-15 11:37:45 -0700 Comment on attachment 61586 WebKitAPI with tweeks Clearing flags on attachment: 61586 Committed r63440: <http://trac.webkit.org/changeset/63440> 252013 10 commit-queue 2010-07-15 11:37:57 -0700 All reviewed patches have been landed. Closing bug. 252017 11 michaeln 2010-07-15 11:41:13 -0700 > Sorry, I meant can we add c'tor that assigns to members? Not a big deal. I think we generally don't like to put code in these .h file, just the interfaces, i was 'iffy' on adding the default ctor already. Anyway that's why i didn't put another ctor there. 61568 2010-07-14 14:37:47 -0700 2010-07-14 17:19:27 -0700 WebKitAPI api.txt text/plain 3448 michaeln SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjMzNTMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDctMTQgIE1pY2hh ZWwgTm9yZG1hbiAgPG1pY2hhZWxuQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0QVBJIGFkZGl0aW9ucyB0byBzdXBwb3J0 IGluc3BlY3RpbmcgYXBwbGljYXRpb24gY2FjaGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE5OTMKKworICAgICAgICAqIHB1YmxpYy9XZWJBcHBs aWNhdGlvbkNhY2hlSG9zdC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hl SG9zdDo6QXBwbGljYXRpb25DYWNoZUluZm86OkFwcGxpY2F0aW9uQ2FjaGVJbmZvKToKKyAgICAg ICAgKFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNoZUhvc3Q6OlJlc291cmNlSW5mbzo6UmVzb3Vy Y2VJbmZvKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNoZUhvc3Q6OmdldEFz c29jaWF0ZWRDYWNoZUluZm8pOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hl SG9zdDo6Z2V0UmVzb3VyY2VMaXN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViQXBwbGljYXRpb25D YWNoZUhvc3Q6OmRlbGV0ZUFzc29jaWF0ZWRDYWNoZUdyb3VwKToKKyAgICAgICAgKiBwdWJsaWMv V2ViQXBwbGljYXRpb25DYWNoZUhvc3RDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViQXBw bGljYXRpb25DYWNoZUhvc3RDbGllbnQ6OmRpZENoYW5nZUNhY2hlQXNzb2NpYXRpb24pOgorCiAy MDEwLTA3LTE0ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHRo ZSBjaHJvbWl1bSBtYWMgYnVpbGQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkFw cGxpY2F0aW9uQ2FjaGVIb3N0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJBcHBsaWNhdGlvbkNhY2hlSG9zdC5oCShyZXZpc2lvbiA2MzI1MCkKKysrIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViQXBwbGljYXRpb25DYWNoZUhvc3QuaAkod29ya2luZyBjb3B5KQpA QCAtMzIsNiArMzIsOCBAQAogI2RlZmluZSBXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdF9oCiAKICNp bmNsdWRlICJXZWJDb21tb24uaCIKKyNpbmNsdWRlICJXZWJVUkwuaCIKKyNpbmNsdWRlICJXZWJW ZWN0b3IuaCIKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTg5LDYgKzkxLDI5IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIFN0YXR1cyBzdGF0dXMoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHN0 YXJ0VXBkYXRlKCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBzd2FwQ2FjaGUoKSA9IDA7CisKKyAg ICAvLyBTdHJ1Y3R1cmVzIGFuZCBtZXRob2RzIHRvIHN1cHBvcnQgaW5zcGVjdGluZyBBcHBsaWNh dGlvbiBDYWNoZXMuCisgICAgc3RydWN0IEFwcGxpY2F0aW9uQ2FjaGVJbmZvIHsKKyAgICAgICAg V2ViVVJMIG1hbmlmZXN0VXJsOyAvLyBFbXB0eSBpZiB0aGVyZSBpcyBubyBhc3NvY2lhdGVkIGNh Y2hlLgorICAgICAgICBkb3VibGUgY3JlYXRpb25UaW1lOworICAgICAgICBkb3VibGUgdXBkYXRl VGltZTsKKyAgICAgICAgbG9uZyBsb25nIHRvdGFsU2l6ZTsKKyAgICAgICAgQXBwbGljYXRpb25D YWNoZUluZm8oKSA6IGNyZWF0aW9uVGltZSgwKSwgdXBkYXRlVGltZSgwKSwgdG90YWxTaXplKDAp IHsgfQorICAgIH07CisgICAgc3RydWN0IFJlc291cmNlSW5mbyB7CisgICAgICAgIFdlYlVSTCB1 cmw7CisgICAgICAgIGxvbmcgbG9uZyBzaXplOworICAgICAgICBib29sIGlzTWFzdGVyOworICAg ICAgICBib29sIGlzTWFuaWZlc3Q7CisgICAgICAgIGJvb2wgaXNFeHBsaWNpdDsKKyAgICAgICAg Ym9vbCBpc0ZvcmVpZ247CisgICAgICAgIGJvb2wgaXNGYWxsYmFjazsKKyAgICAgICAgUmVzb3Vy Y2VJbmZvKCkgOiBzaXplKDApLCBpc01hc3RlcihmYWxzZSksIGlzTWFuaWZlc3QoZmFsc2UpLCBp c0V4cGxpY2l0KGZhbHNlKSwgaXNGb3JlaWduKGZhbHNlKSwgaXNGYWxsYmFjayhmYWxzZSkgeyB9 CisgICAgfTsKKyAgICAvLyBGSVhNRTogTWFrZSB0aGVzZSBwdXJlIHZpcnR1YWwgYWZ0ZXIgY2hy b21lIGhhcyBjYXVnaHQgdXAuCisgICAgdmlydHVhbCB2b2lkIGdldEFzc29jaWF0ZWRDYWNoZUlu Zm8oQXBwbGljYXRpb25DYWNoZUluZm8qKSB7IHJldHVybjsgfQorICAgIHZpcnR1YWwgdm9pZCBn ZXRSZXNvdXJjZUxpc3QoV2ViVmVjdG9yPFJlc291cmNlSW5mbz4qKSB7IHJldHVybjsgfQorICAg IHZpcnR1YWwgdm9pZCBkZWxldGVBc3NvY2lhdGVkQ2FjaGVHcm91cCgpIHsgcmV0dXJuOyB9CiB9 OwogCiB9ICAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0Q2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJBcHBsaWNhdGlvbkNhY2hlSG9zdENsaWVudC5oCShyZXZpc2lvbiA2 MzI1MCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQXBwbGljYXRpb25DYWNoZUhvc3RD bGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksOSBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKIC8vIFRoaXMgaW50ZXJmYWNlIGlzIHVzZWQgYnkgdGhlIGVtYmVkZGVyIHRvIGNhbGwgaW50 byB3ZWJraXQuCiBjbGFzcyBXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdENsaWVudCB7CiBwdWJsaWM6 CisgICAgLy8gQ2FsbGVkIHdoZW4gYSBkaWZmZXJlbnQgY2FjaGUsIGluY2x1ZGluZyBwb3NzaWJs eSBubyBjYWNoZSwgaXMgYXNzb2NpYXRlZCB3aXRoIHRoZSBob3N0LgorICAgIHZpcnR1YWwgdm9p ZCBkaWRDaGFuZ2VDYWNoZUFzc29jaWF0aW9uKCkgeyByZXR1cm47IH0gLy8gRklYTUU6IE1ha2Ug dGhpcyBwdXJlIHZpcnR1YWwuCisKICAgICAvLyBDYWxsZWQgdG8gZmlyZSBldmVudHMgaW4gdGhl IHNjcmlwdGFibGUgaW50ZXJmYWNlLgogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlFdmVudExpc3Rl bmVyKFdlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpFdmVudElEKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIG5vdGlmeVByb2dyZXNzRXZlbnRMaXN0ZW5lcihjb25zdCBXZWJVUkwmLCBpbnQgbnVtX3Rv dGFsLCBpbnQgbnVtX2NvbXBsZXRlKSA9IDA7Cg== 61586 2010-07-14 17:19:27 -0700 2010-07-15 11:37:45 -0700 WebKitAPI with tweeks api2.txt text/plain 5742 michaeln SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjMzNTMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDctMTQgIE1pY2hh ZWwgTm9yZG1hbiAgPG1pY2hhZWxuQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0QVBJIGFkZGl0aW9ucyB0byBzdXBwb3J0 IGluc3BlY3RpbmcgYXBwbGljYXRpb24gY2FjaGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE5OTMKKworICAgICAgICAqIHB1YmxpYy9XZWJBcHBs aWNhdGlvbkNhY2hlSG9zdC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hl SG9zdDo6Q2FjaGVJbmZvOjpDYWNoZUluZm8pOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNh dGlvbkNhY2hlSG9zdDo6UmVzb3VyY2VJbmZvOjpSZXNvdXJjZUluZm8pOgorICAgICAgICAoV2Vi S2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdDo6Z2V0QXNzb2NpYXRlZENhY2hlSW5mbyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpnZXRSZXNvdXJjZUxpc3Qp OgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdDo6ZGVsZXRlQXNzb2Np YXRlZENhY2hlR3JvdXApOgorICAgICAgICAqIHB1YmxpYy9XZWJBcHBsaWNhdGlvbkNhY2hlSG9z dENsaWVudC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdENsaWVu dDo6ZGlkQ2hhbmdlQ2FjaGVBc3NvY2lhdGlvbik6CisgICAgICAgICogc3JjL0FwcGxpY2F0aW9u Q2FjaGVIb3N0SW50ZXJuYWwuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVI b3N0SW50ZXJuYWw6OmRpZENoYW5nZUNhY2hlQXNzb2NpYXRpb24pOgorCiAyMDEwLTA3LTE0ICBT YW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHRoZSBjaHJvbWl1bSBt YWMgYnVpbGQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkFwcGxpY2F0aW9uQ2Fj aGVIb3N0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJBcHBsaWNh dGlvbkNhY2hlSG9zdC5oCShyZXZpc2lvbiA2MzI1MCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQXBwbGljYXRpb25DYWNoZUhvc3QuaAkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIs OCBAQAogI2RlZmluZSBXZWJBcHBsaWNhdGlvbkNhY2hlSG9zdF9oCiAKICNpbmNsdWRlICJXZWJD b21tb24uaCIKKyNpbmNsdWRlICJXZWJVUkwuaCIKKyNpbmNsdWRlICJXZWJWZWN0b3IuaCIKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTcxLDI0ICs3Myw0NiBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB+V2ViQXBwbGljYXRpb25DYWNoZUhvc3QoKSB7IH0KIAogICAgIC8vIENhbGxlZCBmb3Ig ZXZlcnkgcmVxdWVzdCBtYWRlIHdpdGhpbiB0aGUgY29udGV4dC4KLSAgICB2aXJ0dWFsIHZvaWQg d2lsbFN0YXJ0TWFpblJlc291cmNlUmVxdWVzdChXZWJVUkxSZXF1ZXN0JikgPSAwOwotICAgIHZp cnR1YWwgdm9pZCB3aWxsU3RhcnRTdWJSZXNvdXJjZVJlcXVlc3QoV2ViVVJMUmVxdWVzdCYpID0g MDsKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFN0YXJ0TWFpblJlc291cmNlUmVxdWVzdChXZWJVUkxS ZXF1ZXN0JikgeyB9CisgICAgdmlydHVhbCB2b2lkIHdpbGxTdGFydFN1YlJlc291cmNlUmVxdWVz dChXZWJVUkxSZXF1ZXN0JikgeyB9CiAKICAgICAvLyBPbmUgb3IgdGhlIG90aGVyIHNlbGVjdENh Y2hlIG1ldGhvZHMgaXMgY2FsbGVkIGFmdGVyIGhhdmluZyBwYXJzZWQgdGhlIDxodG1sPiB0YWcu CiAgICAgLy8gVGhlIGxhdHRlciByZXR1cm5zIGZhbHNlIGlmIHRoZSBjdXJyZW50IGRvY3VtZW50 IGhhcyBiZWVuIGlkZW50aWZpZWQgYXMgYSAiZm9yZWlnbiIKICAgICAvLyBlbnRyeSwgaW4gd2hp Y2ggY2FzZSB0aGUgZnJhbWUgbmF2aWdhdGlvbiB3aWxsIGJlIHJlc3RhcnRlZCBieSB3ZWJraXQu Ci0gICAgdmlydHVhbCB2b2lkIHNlbGVjdENhY2hlV2l0aG91dE1hbmlmZXN0KCkgPSAwOwotICAg IHZpcnR1YWwgYm9vbCBzZWxlY3RDYWNoZVdpdGhNYW5pZmVzdChjb25zdCBXZWJVUkwmIG1hbmlm ZXN0VVJMKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNlbGVjdENhY2hlV2l0aG91dE1hbmlmZXN0 KCkgeyB9CisgICAgdmlydHVhbCBib29sIHNlbGVjdENhY2hlV2l0aE1hbmlmZXN0KGNvbnN0IFdl YlVSTCYgbWFuaWZlc3RVUkwpIHsgcmV0dXJuIHRydWU7IH0KIAogICAgIC8vIENhbGxlZCBhcyB0 aGUgbWFpbiByZXNvdXJjZSBpcyByZXRyaWV2ZWQuCi0gICAgdmlydHVhbCB2b2lkIGRpZFJlY2Vp dmVSZXNwb25zZUZvck1haW5SZXNvdXJjZShjb25zdCBXZWJVUkxSZXNwb25zZSYpID0gMDsKLSAg ICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGFGb3JNYWluUmVzb3VyY2UoY29uc3QgY2hhciog ZGF0YSwgaW50IGxlbikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5nTWFp blJlc291cmNlKGJvb2wgc3VjY2VzcykgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZl UmVzcG9uc2VGb3JNYWluUmVzb3VyY2UoY29uc3QgV2ViVVJMUmVzcG9uc2UmKSB7IH0KKyAgICB2 aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGFGb3JNYWluUmVzb3VyY2UoY29uc3QgY2hhciogZGF0 YSwgaW50IGxlbikgeyB9CisgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmdNYWluUmVz b3VyY2UoYm9vbCBzdWNjZXNzKSB7IH0KIAogICAgIC8vIENhbGxlZCBvbiBiZWhhbGYgb2YgdGhl IHNjcmlwdGFibGUgaW50ZXJmYWNlLgotICAgIHZpcnR1YWwgU3RhdHVzIHN0YXR1cygpID0gMDsK LSAgICB2aXJ0dWFsIGJvb2wgc3RhcnRVcGRhdGUoKSA9IDA7Ci0gICAgdmlydHVhbCBib29sIHN3 YXBDYWNoZSgpID0gMDsKKyAgICB2aXJ0dWFsIFN0YXR1cyBzdGF0dXMoKSB7IHJldHVybiBVbmNh Y2hlZDsgfQorICAgIHZpcnR1YWwgYm9vbCBzdGFydFVwZGF0ZSgpIHsgcmV0dXJuIGZhbHNlOyB9 CisgICAgdmlydHVhbCBib29sIHN3YXBDYWNoZSgpIHsgcmV0dXJuIGZhbHNlOyB9CisKKyAgICAv LyBTdHJ1Y3R1cmVzIGFuZCBtZXRob2RzIHRvIHN1cHBvcnQgaW5zcGVjdGluZyBBcHBsaWNhdGlv biBDYWNoZXMuCisgICAgc3RydWN0IENhY2hlSW5mbyB7CisgICAgICAgIFdlYlVSTCBtYW5pZmVz dFVSTDsgLy8gRW1wdHkgaWYgdGhlcmUgaXMgbm8gYXNzb2NpYXRlZCBjYWNoZS4KKyAgICAgICAg ZG91YmxlIGNyZWF0aW9uVGltZTsKKyAgICAgICAgZG91YmxlIHVwZGF0ZVRpbWU7CisgICAgICAg IGxvbmcgbG9uZyB0b3RhbFNpemU7CisgICAgICAgIENhY2hlSW5mbygpIDogY3JlYXRpb25UaW1l KDApLCB1cGRhdGVUaW1lKDApLCB0b3RhbFNpemUoMCkgeyB9CisgICAgfTsKKyAgICBzdHJ1Y3Qg UmVzb3VyY2VJbmZvIHsKKyAgICAgICAgV2ViVVJMIHVybDsKKyAgICAgICAgbG9uZyBsb25nIHNp emU7CisgICAgICAgIGJvb2wgaXNNYXN0ZXI7CisgICAgICAgIGJvb2wgaXNNYW5pZmVzdDsKKyAg ICAgICAgYm9vbCBpc0V4cGxpY2l0OworICAgICAgICBib29sIGlzRm9yZWlnbjsKKyAgICAgICAg Ym9vbCBpc0ZhbGxiYWNrOworICAgICAgICBSZXNvdXJjZUluZm8oKSA6IHNpemUoMCksIGlzTWFz dGVyKGZhbHNlKSwgaXNNYW5pZmVzdChmYWxzZSksIGlzRXhwbGljaXQoZmFsc2UpLCBpc0ZvcmVp Z24oZmFsc2UpLCBpc0ZhbGxiYWNrKGZhbHNlKSB7IH0KKyAgICB9OworICAgIHZpcnR1YWwgdm9p ZCBnZXRBc3NvY2lhdGVkQ2FjaGVJbmZvKENhY2hlSW5mbyopIHsgfQorICAgIHZpcnR1YWwgdm9p ZCBnZXRSZXNvdXJjZUxpc3QoV2ViVmVjdG9yPFJlc291cmNlSW5mbz4qKSB7IH0KKyAgICB2aXJ0 dWFsIHZvaWQgZGVsZXRlQXNzb2NpYXRlZENhY2hlR3JvdXAoKSB7IH0KIH07CiAKIH0gIC8vIG5h bWVzcGFjZSBXZWJLaXQKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQXBwbGljYXRp b25DYWNoZUhvc3RDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0Q2xpZW50LmgJKHJldmlzaW9uIDYzMjUwKQorKysgV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJBcHBsaWNhdGlvbkNhY2hlSG9zdENsaWVudC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOSw2ICszOSw5IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogLy8gVGhpcyBp bnRlcmZhY2UgaXMgdXNlZCBieSB0aGUgZW1iZWRkZXIgdG8gY2FsbCBpbnRvIHdlYmtpdC4KIGNs YXNzIFdlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0Q2xpZW50IHsKIHB1YmxpYzoKKyAgICAvLyBDYWxs ZWQgd2hlbiBhIGRpZmZlcmVudCBjYWNoZSwgaW5jbHVkaW5nIHBvc3NpYmx5IG5vIGNhY2hlLCBp cyBhc3NvY2lhdGVkIHdpdGggdGhlIGhvc3QuCisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUNh Y2hlQXNzb2NpYXRpb24oKSA9IDA7CisKICAgICAvLyBDYWxsZWQgdG8gZmlyZSBldmVudHMgaW4g dGhlIHNjcmlwdGFibGUgaW50ZXJmYWNlLgogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlFdmVudExp c3RlbmVyKFdlYkFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpFdmVudElEKSA9IDA7CiAgICAgdmlydHVh bCB2b2lkIG5vdGlmeVByb2dyZXNzRXZlbnRMaXN0ZW5lcihjb25zdCBXZWJVUkwmLCBpbnQgbnVt X3RvdGFsLCBpbnQgbnVtX2NvbXBsZXRlKSA9IDA7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L0FwcGxpY2F0aW9uQ2FjaGVIb3N0SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hy b21pdW0vc3JjL0FwcGxpY2F0aW9uQ2FjaGVIb3N0SW50ZXJuYWwuaAkocmV2aXNpb24gNjMyNTAp CisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0FwcGxpY2F0aW9uQ2FjaGVIb3N0SW50ZXJuYWwuaAko d29ya2luZyBjb3B5KQpAQCAtNTMsNiArNTMsMTEgQEAgcHVibGljOgogICAgICAgICBtX291dGVy SG9zdC5zZXQod2ViRnJhbWUtPmNsaWVudCgpLT5jcmVhdGVBcHBsaWNhdGlvbkNhY2hlSG9zdCh3 ZWJGcmFtZSwgdGhpcykpOwogICAgIH0KIAorICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VDYWNo ZUFzc29jaWF0aW9uKCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1FOiBQcm9kIHRoZSBpbnNwZWN0 b3IgdG8gdXBkYXRlIGl0J3Mgbm90aW9uIG9mIHdoYXQgY2FjaGUgdGhlIHBhZ2UgaXMgdXNpbmcu CisgICAgfQorCiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeUV2ZW50TGlzdGVuZXIoV2ViS2l0OjpX ZWJBcHBsaWNhdGlvbkNhY2hlSG9zdDo6RXZlbnRJRCBldmVudElEKQogICAgIHsKICAgICAgICAg bV9pbm5lckhvc3QtPm5vdGlmeURPTUFwcGxpY2F0aW9uQ2FjaGUoc3RhdGljX2Nhc3Q8QXBwbGlj YXRpb25DYWNoZUhvc3Q6OkV2ZW50SUQ+KGV2ZW50SUQpLCAwLCAwKTsK