52815 2011-01-20 08:11:02 -0800 Web Inspector: enable resource agent upon request. 2011-01-20 09:12:43 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 337346 0 pfeldman 2011-01-20 08:11:02 -0800 We should not send network-related notifications unless front-end is interested. 337348 1 79602 pfeldman 2011-01-20 08:15:43 -0800 Created attachment 79602 [PATCH] Proposed change 337354 2 79602 caseq 2011-01-20 08:27:44 -0800 Comment on attachment 79602 [PATCH] Proposed change View in context: https://bugs.webkit.org/attachment.cgi?id=79602&action=review Looks good. > Source/WebCore/inspector/InspectorResourceAgent.h:52 > class InspectorObject; nit: this looks out of order. 337358 3 79602 yurys 2011-01-20 08:37:44 -0800 Comment on attachment 79602 [PATCH] Proposed change View in context: https://bugs.webkit.org/attachment.cgi?id=79602&action=review > Source/WebCore/inspector/InspectorController.cpp:491 > +InspectorResourceAgent* InspectorController::resourceAgent() We should be consistent: either agents are enabled explicitly or on demand. 337370 4 pfeldman 2011-01-20 08:49:39 -0800 Committed r76249: <http://trac.webkit.org/changeset/76249> 337387 5 webkit.review.bot 2011-01-20 09:12:43 -0800 http://trac.webkit.org/changeset/76249 might have broken Windows Debug (Build) 79602 2011-01-20 08:15:43 -0800 2011-01-20 08:37:44 -0800 [PATCH] Proposed change inspector_resource text/plain 12640 pfeldman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjODE3Y2U1Li5jOTIzOTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEg QEAKIDIwMTEtMDEtMjAgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogZW5hYmxlIHJlc291cmNlIGFnZW50IHVwb24gcmVxdWVzdC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyODE1CisKKyAgICAgICAgV2Ugc2hv dWxkIG5vdCBzZW5kIG5ldHdvcmstcmVsYXRlZCBub3RpZmljYXRpb25zIHVubGVzcyBmcm9udC1l bmQKKyAgICAgICAgaXMgaW50ZXJlc3RlZC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3IuaWRsOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnJlc3RvcmVJbnNwZWN0b3JTdGF0 ZUZyb21Db29raWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6Y29u bmVjdEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnJl c291cmNlQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpjb25zb2xlQWdlbnQpOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6Y3NzQWdlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZG9tQWdlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6aW5qZWN0ZWRTY3JpcHRBZ2VudCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpydW50aW1lQWdlbnQpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGF0YWJhc2VBZ2VudCk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkb21TdG9yYWdlQWdlbnQpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZmlsZVN5c3RlbUFnZW50KToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6cmV0cmlldmVSZXNvdXJjZUFnZW50KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXN0b3JlKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6On5JbnNwZWN0b3JSZXNvdXJjZUFnZW50KToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6Okluc3BlY3RvclJlc291cmNl QWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50Lmg6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpjcmVhdGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JTdGF0ZTo6SW5zcGVjdG9yU3RhdGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JTdGF0ZS5oOgorCisyMDExLTAxLTIwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21p dW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgcmVsZWFzZU9iamVjdEdyb3Vw IHRvIHRoZSBuZXcgUnVudGltZSBhZ2VudC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUyODAzCiAgICAgICAgIChhY2NlZGVudGFsbHkgbGFuZGVkIGFz IHI3NjIzMSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu aWRsIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKaW5kZXggODZlZDVj NC4uYjhkMTI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAgLTEw Miw4ICsxMDIsOCBAQCBtb2R1bGUgY29yZSB7CiAKICAgICAgICAgW2RvbWFpbj1OZXR3b3JrXSB2 b2lkIGNhY2hlZFJlc291cmNlcyhvdXQgT2JqZWN0IHJlc291cmNlcyk7CiAgICAgICAgIFtkb21h aW49TmV0d29ya10gdm9pZCByZXNvdXJjZUNvbnRlbnQoaW4gdW5zaWduZWQgbG9uZyBmcmFtZUlk LCBpbiBTdHJpbmcgdXJsLCBpbiBib29sZWFuIGJhc2U2NEVuY29kZSwgb3V0IFN0cmluZyBjb250 ZW50KTsKLSAgICAgICAgW25vdGlmeSwgZG9tYWluPU5ldHdvcmtdIHZvaWQgZnJhbWVEZXRhY2hl ZEZyb21QYXJlbnQob3V0IHVuc2lnbmVkIGxvbmcgZnJhbWVJZCk7CiAKKyAgICAgICAgW25vdGlm eSwgZG9tYWluPU5ldHdvcmtdIHZvaWQgZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQob3V0IHVuc2ln bmVkIGxvbmcgZnJhbWVJZCk7CiAgICAgICAgIFtub3RpZnksIGRvbWFpbj1OZXR3b3JrXSB2b2lk IGlkZW50aWZpZXJGb3JJbml0aWFsUmVxdWVzdChvdXQgbG9uZyBpZGVudGlmaWVyLCBvdXQgU3Ry aW5nIHVybCwgb3V0IE9iamVjdCBsb2FkZXIsIG91dCBWYWx1ZSBjYWxsU3RhY2spOwogICAgICAg ICBbbm90aWZ5LCBkb21haW49TmV0d29ya10gdm9pZCB3aWxsU2VuZFJlcXVlc3Qob3V0IGxvbmcg aWRlbnRpZmllciwgb3V0IGRvdWJsZSB0aW1lLCBvdXQgT2JqZWN0IHJlcXVlc3QsIG91dCBPYmpl Y3QgcmVkaXJlY3RSZXNwb25zZSk7CiAgICAgICAgIFtub3RpZnksIGRvbWFpbj1OZXR3b3JrXSB2 b2lkIG1hcmtSZXNvdXJjZUFzQ2FjaGVkKG91dCBsb25nIGlkZW50aWZpZXIpOwpAQCAtMTI1LDEw ICsxMjUsMTEgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICAvLyBEYXRhYmFzZSBBUEkKICAgICAg ICAgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8KIAotICAgICAgICBbbm90aWZ5LCBkb21haW49RGF0YWJhc2VdIHZv aWQgYWRkRGF0YWJhc2Uob3V0IE9iamVjdCBkYXRhYmFzZSk7Ci0gICAgICAgIFtub3RpZnksIGRv bWFpbj1EYXRhYmFzZV0gdm9pZCBzZWxlY3REYXRhYmFzZShvdXQgaW50IGRhdGFiYXNlSWQpOwog ICAgICAgICBbZG9tYWluPURhdGFiYXNlXSB2b2lkIGdldERhdGFiYXNlVGFibGVOYW1lcyhpbiBs b25nIGRhdGFiYXNlSWQsIG91dCBBcnJheSB0YWJsZU5hbWVzKTsKICAgICAgICAgW2RvbWFpbj1E YXRhYmFzZV0gdm9pZCBleGVjdXRlU1FMKGluIGxvbmcgZGF0YWJhc2VJZCwgaW4gU3RyaW5nIHF1 ZXJ5LCBvdXQgYm9vbGVhbiBzdWNjZXNzLCBvdXQgbG9uZyB0cmFuc2FjdGlvbklkKTsKKworICAg ICAgICBbbm90aWZ5LCBkb21haW49RGF0YWJhc2VdIHZvaWQgYWRkRGF0YWJhc2Uob3V0IE9iamVj dCBkYXRhYmFzZSk7CisgICAgICAgIFtub3RpZnksIGRvbWFpbj1EYXRhYmFzZV0gdm9pZCBzZWxl Y3REYXRhYmFzZShvdXQgaW50IGRhdGFiYXNlSWQpOwogICAgICAgICBbbm90aWZ5LCBkb21haW49 RGF0YWJhc2VdIHZvaWQgc3FsVHJhbnNhY3Rpb25TdWNjZWVkZWQob3V0IGxvbmcgdHJhbnNhY3Rp b25JZCwgb3V0IFZhbHVlIGNvbHVtbk5hbWVzLCBvdXQgVmFsdWUgdmFsdWVzKTsKICAgICAgICAg W25vdGlmeSwgZG9tYWluPURhdGFiYXNlXSB2b2lkIHNxbFRyYW5zYWN0aW9uRmFpbGVkKG91dCBs b25nIHRyYW5zYWN0aW9uSWQsIG91dCBWYWx1ZSBzcWxFcnJvcik7CiAjZW5kaWYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCA3NzZi ZGQ4Li4xODBlODM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwCkBAIC0yMjcsNiArMjI3LDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9s bGVyOjpyZXN0b3JlSW5zcGVjdG9yU3RhdGVGcm9tQ29va2llKGNvbnN0IFN0cmluZyYgaW5zcGVj dG8KICAgICAgICAgcHVzaERhdGFDb2xsZWN0ZWRPZmZsaW5lKCk7CiAgICAgfQogCisgICAgbV9y ZXNvdXJjZUFnZW50ID0gSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzdG9yZShtX2luc3BlY3Rl ZFBhZ2UsIG1fc3RhdGUuZ2V0KCksIG1fZnJvbnRlbmQuZ2V0KCkpOworCiAgICAgaWYgKG1fc3Rh dGUtPmdldEJvb2xlYW4oSW5zcGVjdG9yU3RhdGU6OnRpbWVsaW5lUHJvZmlsZXJFbmFibGVkKSkK ICAgICAgICAgc3RhcnRUaW1lbGluZVByb2ZpbGVyKCk7CiAKQEAgLTM4MCw5ICszODIsNyBAQCB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmNvbm5lY3RGcm9udGVuZCgpCiAgICAgcmVsZWFzZUZy b250ZW5kTGlmZXRpbWVBZ2VudHMoKTsKICAgICBtX2Zyb250ZW5kID0gbmV3IEluc3BlY3RvckZy b250ZW5kKG1fY2xpZW50KTsKICAgICBtX2RvbUFnZW50ID0gSW5zcGVjdG9yRE9NQWdlbnQ6OmNy ZWF0ZShtX2luamVjdGVkU2NyaXB0SG9zdC5nZXQoKSwgbV9mcm9udGVuZC5nZXQoKSk7Ci0gICAg bV9yZXNvdXJjZUFnZW50ID0gSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Y3JlYXRlKG1faW5zcGVj dGVkUGFnZSwgbV9mcm9udGVuZC5nZXQoKSk7CiAgICAgbV9ydW50aW1lQWdlbnQgPSBJbnNwZWN0 b3JSdW50aW1lQWdlbnQ6OmNyZWF0ZShtX2luamVjdGVkU2NyaXB0SG9zdC5nZXQoKSk7Ci0KICAg ICBtX2Nzc0FnZW50LT5zZXRET01BZ2VudChtX2RvbUFnZW50LmdldCgpKTsKIAogI2lmIEVOQUJM RShEQVRBQkFTRSkKQEAgLTQ4OCw2ICs0ODgsMTMgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy OjpkaXNjb25uZWN0RnJvbnRlbmQoKQogICAgIG1fZXh0cmFIZWFkZXJzLmNsZWFyKCk7CiB9CiAK K0luc3BlY3RvclJlc291cmNlQWdlbnQqIEluc3BlY3RvckNvbnRyb2xsZXI6OnJlc291cmNlQWdl bnQoKQoreworICAgIGlmICghbV9yZXNvdXJjZUFnZW50ICYmIG1fZnJvbnRlbmQpCisgICAgICAg IG1fcmVzb3VyY2VBZ2VudCA9IEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmNyZWF0ZShtX2luc3Bl Y3RlZFBhZ2UsIG1fc3RhdGUuZ2V0KCksIG1fZnJvbnRlbmQuZ2V0KCkpOworICAgIHJldHVybiBt X3Jlc291cmNlQWdlbnQuZ2V0KCk7Cit9CisKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cmVs ZWFzZUZyb250ZW5kTGlmZXRpbWVBZ2VudHMoKQogewogICAgIG1fcmVzb3VyY2VBZ2VudC5jbGVh cigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgK aW5kZXggYWRlZTFiZS4uODRjODIxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0xNDUsMjIgKzE0NSwyMyBAQCBwdWJsaWM6CiAgICAg dm9pZCByZXVzZUZyb250ZW5kKCk7CiAgICAgdm9pZCBkaXNjb25uZWN0RnJvbnRlbmQoKTsKIAor ICAgIEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQoKTsKKwogICAgIEluc3Bl Y3RvckNvbnRyb2xsZXIqIGluc3BlY3RvckFnZW50KCkgeyByZXR1cm4gdGhpczsgfQotICAgIElu c3BlY3RvckNvbnNvbGVBZ2VudCogY29uc29sZUFnZW50KCkgY29uc3QgeyByZXR1cm4gbV9jb25z b2xlQWdlbnQuZ2V0KCk7IH0KLSAgICBJbnNwZWN0b3JDU1NBZ2VudCogY3NzQWdlbnQoKSBjb25z dCB7IHJldHVybiBtX2Nzc0FnZW50LmdldCgpOyB9Ci0gICAgSW5zcGVjdG9yRE9NQWdlbnQqIGRv bUFnZW50KCkgY29uc3QgeyByZXR1cm4gbV9kb21BZ2VudC5nZXQoKTsgfQotICAgIEluamVjdGVk U2NyaXB0SG9zdCogaW5qZWN0ZWRTY3JpcHRBZ2VudCgpIGNvbnN0IHsgcmV0dXJuIG1faW5qZWN0 ZWRTY3JpcHRIb3N0LmdldCgpOyB9Ci0gICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCogcmVzb3Vy Y2VBZ2VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VBZ2VudC5nZXQoKTsgfQotICAgIElu c3BlY3RvclJ1bnRpbWVBZ2VudCogcnVudGltZUFnZW50KCkgY29uc3QgeyByZXR1cm4gbV9ydW50 aW1lQWdlbnQuZ2V0KCk7IH0KKyAgICBJbnNwZWN0b3JDb25zb2xlQWdlbnQqIGNvbnNvbGVBZ2Vu dCgpIHsgcmV0dXJuIG1fY29uc29sZUFnZW50LmdldCgpOyB9CisgICAgSW5zcGVjdG9yQ1NTQWdl bnQqIGNzc0FnZW50KCkgeyByZXR1cm4gbV9jc3NBZ2VudC5nZXQoKTsgfQorICAgIEluc3BlY3Rv ckRPTUFnZW50KiBkb21BZ2VudCgpIHsgcmV0dXJuIG1fZG9tQWdlbnQuZ2V0KCk7IH0KKyAgICBJ bmplY3RlZFNjcmlwdEhvc3QqIGluamVjdGVkU2NyaXB0QWdlbnQoKSB7IHJldHVybiBtX2luamVj dGVkU2NyaXB0SG9zdC5nZXQoKTsgfQorICAgIEluc3BlY3RvclJ1bnRpbWVBZ2VudCogcnVudGlt ZUFnZW50KCkgeyByZXR1cm4gbV9ydW50aW1lQWdlbnQuZ2V0KCk7IH0KICAgICBJbnNwZWN0b3JU aW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50KCkgeyByZXR1cm4gbV90aW1lbGluZUFnZW50Lmdl dCgpOyB9CiAjaWYgRU5BQkxFKERBVEFCQVNFKQotICAgIEluc3BlY3RvckRhdGFiYXNlQWdlbnQq IGRhdGFiYXNlQWdlbnQoKSBjb25zdCB7IHJldHVybiBtX2RhdGFiYXNlQWdlbnQuZ2V0KCk7IH0K KyAgICBJbnNwZWN0b3JEYXRhYmFzZUFnZW50KiBkYXRhYmFzZUFnZW50KCkgeyByZXR1cm4gbV9k YXRhYmFzZUFnZW50LmdldCgpOyB9CiAjZW5kaWYKICNpZiBFTkFCTEUoRE9NX1NUT1JBR0UpCi0g ICAgSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50KiBkb21TdG9yYWdlQWdlbnQoKSBjb25zdCB7IHJl dHVybiBtX2RvbVN0b3JhZ2VBZ2VudC5nZXQoKTsgfQorICAgIEluc3BlY3RvckRPTVN0b3JhZ2VB Z2VudCogZG9tU3RvcmFnZUFnZW50KCkgeyByZXR1cm4gbV9kb21TdG9yYWdlQWdlbnQuZ2V0KCk7 IH0KICNlbmRpZgogI2lmIEVOQUJMRShGSUxFX1NZU1RFTSkKLSAgICBJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQqIGZpbGVTeXN0ZW1BZ2VudCgpIGNvbnN0IHsgcmV0dXJuIG1fZmlsZVN5c3RlbUFn ZW50LmdldCgpOyB9CisgICAgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50KiBmaWxlU3lzdGVtQWdl bnQoKSB7IHJldHVybiBtX2ZpbGVTeXN0ZW1BZ2VudC5nZXQoKTsgfQogI2VuZGlmCiAjaWYgRU5B QkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdl bnQqIGJyb3dzZXJEZWJ1Z2dlckFnZW50KCkgY29uc3QgeyByZXR1cm4gbV9icm93c2VyRGVidWdn ZXJBZ2VudC5nZXQoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAppbmRleCBhYTk0MWRmLi4wOTAxMGEyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u LmNwcApAQCAtNjUyLDcgKzY1Miw3IEBAIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6cmV0cmlldmVUaW1lbGluZUFnZW50KGNvbnN0IEluCiAKIEluc3Bl Y3RvclJlc291cmNlQWdlbnQqIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6cmV0cmlldmVSZXNv dXJjZUFnZW50KEluc3BlY3RvckNvbnRyb2xsZXIqIGljKQogewotICAgIHJldHVybiBpYy0+bV9y ZXNvdXJjZUFnZW50LmdldCgpOworICAgIHJldHVybiBpYy0+cmVzb3VyY2VBZ2VudCgpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggNjc3OTc5MC4uMDI5Yzc5ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmNwcApAQCAtNDUsNiArNDUsNyBAQAogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUg IkhUVFBIZWFkZXJNYXAuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZC5oIgorI2luY2x1 ZGUgIkluc3BlY3RvclN0YXRlLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yVmFsdWVzLmgiCiAjaW5j bHVkZSAiS1VSTC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKQEAgLTY2LDYgKzY3LDEzIEBACiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAorUGFzc1JlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZUFnZW50PiBJ bnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXN0b3JlKFBhZ2UqIHBhZ2UsIEluc3BlY3RvclN0YXRl KiBzdGF0ZSwgSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQoreworICAgIGlmIChzdGF0ZS0+ Z2V0Qm9vbGVhbihJbnNwZWN0b3JTdGF0ZTo6cmVzb3VyY2VBZ2VudEVuYWJsZWQpKQorICAgICAg ICByZXR1cm4gY3JlYXRlKHBhZ2UsIHN0YXRlLCBmcm9udGVuZCk7CisgICAgcmV0dXJuIDA7Cit9 CisKIGJvb2wgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KEZyYW1lKiBm cmFtZSwgY29uc3QgS1VSTCYgdXJsLCBTdHJpbmcqIHJlc3VsdCkKIHsKICAgICBpZiAoIWZyYW1l KQpAQCAtMjgxLDYgKzI4OSw3IEBAIHN0YXRpYyB2b2lkIHBvcHVsYXRlT2JqZWN0V2l0aEZyYW1l UmVzb3VyY2VzKEZyYW1lKiBmcmFtZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPCiAKIEluc3BlY3Rv clJlc291cmNlQWdlbnQ6On5JbnNwZWN0b3JSZXNvdXJjZUFnZW50KCkKIHsKKyAgICBtX3N0YXRl LT5zZXRCb29sZWFuKEluc3BlY3RvclN0YXRlOjpyZXNvdXJjZUFnZW50RW5hYmxlZCwgZmFsc2Up OwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmlkZW50aWZpZXJGb3JJbml0aWFs UmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IEtVUkwmIHVybCwgRG9jdW1l bnRMb2FkZXIqIGxvYWRlcikKQEAgLTQ3NiwxMCArNDg1LDEyIEBAIHZvaWQgSW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgaWQsIGNvbnN0IFN0cmlu ZyYgdXJsCiAgICAgfQogfQogCi1JbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpJbnNwZWN0b3JSZXNv dXJjZUFnZW50KFBhZ2UqIHBhZ2UsIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKK0luc3Bl Y3RvclJlc291cmNlQWdlbnQ6Okluc3BlY3RvclJlc291cmNlQWdlbnQoUGFnZSogcGFnZSwgSW5z cGVjdG9yU3RhdGUqIHN0YXRlLCBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCiAgICAgOiBt X3BhZ2UocGFnZSkKKyAgICAsIG1fc3RhdGUoc3RhdGUpCiAgICAgLCBtX2Zyb250ZW5kKGZyb250 ZW5kKQogeworICAgIG1fc3RhdGUtPnNldEJvb2xlYW4oSW5zcGVjdG9yU3RhdGU6OnJlc291cmNl QWdlbnRFbmFibGVkLCB0cnVlKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKaW5kZXgg MWU3N2Q1OC4uZjMzNTM1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJlc291cmNlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2VBZ2VudC5oCkBAIC01MSw2ICs1MSw3IEBAIGNsYXNzIEZyYW1lOwogY2xh c3MgSW5zcGVjdG9yQXJyYXk7CiBjbGFzcyBJbnNwZWN0b3JPYmplY3Q7CiBjbGFzcyBJbnNwZWN0 b3JGcm9udGVuZDsKK2NsYXNzIEluc3BlY3RvclN0YXRlOwogY2xhc3MgS1VSTDsKIGNsYXNzIFBh Z2U7CiBjbGFzcyBSZXNvdXJjZUVycm9yOwpAQCAtNjUsMTEgKzY2LDEzIEBAIGNsYXNzIFdlYlNv Y2tldEhhbmRzaGFrZVJlc3BvbnNlOwogCiBjbGFzcyBJbnNwZWN0b3JSZXNvdXJjZUFnZW50IDog cHVibGljIFJlZkNvdW50ZWQ8SW5zcGVjdG9yUmVzb3VyY2VBZ2VudD4gewogcHVibGljOgotICAg IHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvclJlc291cmNlQWdlbnQ+IGNyZWF0ZShQYWdlKiBw YWdlLCBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCisgICAgc3RhdGljIFBhc3NSZWZQdHI8 SW5zcGVjdG9yUmVzb3VyY2VBZ2VudD4gY3JlYXRlKFBhZ2UqIHBhZ2UsIEluc3BlY3RvclN0YXRl KiBzdGF0ZSwgSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogICAgIHsKLSAgICAgICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBJbnNwZWN0b3JSZXNvdXJjZUFnZW50KHBhZ2UsIGZyb250ZW5kKSk7 CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudChwYWdl LCBzdGF0ZSwgZnJvbnRlbmQpKTsKICAgICB9CiAKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNw ZWN0b3JSZXNvdXJjZUFnZW50PiByZXN0b3JlKFBhZ2UqLCBJbnNwZWN0b3JTdGF0ZSosIEluc3Bl Y3RvckZyb250ZW5kKik7CisKICAgICBzdGF0aWMgYm9vbCByZXNvdXJjZUNvbnRlbnQoRnJhbWUq LCBjb25zdCBLVVJMJiwgU3RyaW5nKiByZXN1bHQpOwogICAgIHN0YXRpYyBib29sIHJlc291cmNl Q29udGVudEJhc2U2NChGcmFtZSosIGNvbnN0IEtVUkwmLCBTdHJpbmcqIHJlc3VsdCk7CiAgICAg c3RhdGljIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiByZXNvdXJjZURhdGEoRnJhbWUqLCBjb25z dCBLVVJMJiwgU3RyaW5nKiB0ZXh0RW5jb2RpbmdOYW1lKTsKQEAgLTEwMyw5ICsxMDYsMTAgQEAg cHVibGljOgogICAgIHZvaWQgcmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgZnJhbWVJRCwg Y29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgYmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRlbnQpOwog CiBwcml2YXRlOgotICAgIEluc3BlY3RvclJlc291cmNlQWdlbnQoUGFnZSogcGFnZSwgSW5zcGVj dG9yRnJvbnRlbmQqIGZyb250ZW5kKTsKKyAgICBJbnNwZWN0b3JSZXNvdXJjZUFnZW50KFBhZ2Uq IHBhZ2UsIEluc3BlY3RvclN0YXRlKiwgSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKTsKIAog ICAgIFBhZ2UqIG1fcGFnZTsKKyAgICBJbnNwZWN0b3JTdGF0ZSogbV9zdGF0ZTsKICAgICBJbnNw ZWN0b3JGcm9udGVuZCogbV9mcm9udGVuZDsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yU3RhdGUuY3BwCmluZGV4IDAwYzJhMzQuLjIyMjk0YTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcApAQCAtNDUsNiArNDUsNyBAQCBJ bnNwZWN0b3JTdGF0ZTo6SW5zcGVjdG9yU3RhdGUoSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCiAg ICAgcmVnaXN0ZXJPYmplY3Qoc3RpY2t5QnJlYWtwb2ludHMpOwogICAgIHJlZ2lzdGVyQm9vbGVh bihjb25zb2xlTWVzc2FnZXNFbmFibGVkLCBmYWxzZSk7CiAgICAgcmVnaXN0ZXJCb29sZWFuKG1v bml0b3JpbmdYSFIsIGZhbHNlKTsKKyAgICByZWdpc3RlckJvb2xlYW4ocmVzb3VyY2VBZ2VudEVu YWJsZWQsIGZhbHNlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JTdGF0ZTo6cmVzdG9yZUZyb21JbnNw ZWN0b3JDb29raWUoY29uc3QgU3RyaW5nJiBqc29uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yU3RhdGUuaAppbmRleCAzZGM0NTQzLi5iNjJmOGRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuaApAQCAtNTAsNiArNTAsNyBAQCBwdWJsaWM6CiAg ICAgICAgIGNvbnNvbGVNZXNzYWdlc0VuYWJsZWQsCiAgICAgICAgIHVzZXJJbml0aWF0ZWRQcm9m aWxpbmcsCiAgICAgICAgIHN0aWNreUJyZWFrcG9pbnRzLAorICAgICAgICByZXNvdXJjZUFnZW50 RW5hYmxlZCwKICAgICAgICAgbGFzdFByb3BlcnR5SWQKICAgICB9OwogCg==