32336 2009-12-09 12:02:07 -0800 Update Chromium Loader to pass through the new ResourceType::TargetType 2009-12-28 23:30:26 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mbelshe mbelshe commit-queue eric michaeln webkit.review.bot oldest_to_newest 170092 0 mbelshe 2009-12-09 12:02:07 -0800 FrameLoaderClientImpl.cpp previously would override the resource type as a generic TargetIsSubresource when the target is not a main or subframe. Update to only modify the type if the resource is a frame; otherwise, leave the setting as is, since the ResourceRequest now initializes and sets the resource type properly. 170104 1 44554 mbelshe 2009-12-09 12:17:19 -0800 Created attachment 44554 patch 170106 2 webkit.review.bot 2009-12-09 12:19:26 -0800 style-queue ran check-webkit-style on attachment 44554 without any errors. 170132 3 44554 eric 2009-12-09 13:24:27 -0800 Comment on attachment 44554 patch Looks sane. Although you've already filled in the Reviewed by line, so I'm not sure what needs to be done for this patch if anything... 170140 4 44554 fishd 2009-12-09 13:29:53 -0800 Comment on attachment 44554 patch > Index: WebKit/chromium/public/WebURLRequest.h > - TargetIsSubFrame, > - TargetIsSubResource, > + TargetIsSubframe, > + TargetIsSubresource, > + TargetIsStyleSheet, > + TargetIsScript, > + TargetIsFontResource, > + TargetIsImage, Removal of webkit api is something we generally try to stage. Otherwise, it puts burden on the person performing the webkit update to land a two-sided patch :-( I think I saw you send michaeln a patch for the Chromium side of this, but in the future please preserve the old webkit api, and then remove it in a subsequent patch once Chromium has been updated. Otherwise, r=me too. 170226 5 michaeln 2009-12-09 15:42:59 -0800 > I think I saw you send michaeln a patch for the Chromium side > of this, but in the future please preserve the old webkit api, > and then remove it in a subsequent patch once Chromium has > been updated. Change looks great, having more nuanced info about what is being retrieved is really nice. As mentioned in http://codereview.chromium.org/477008, can we stage these changes in without the need of the two-headed patch dance (you never know when the change that breaks 500 layout tests will just show up). 170237 6 44579 mbelshe 2009-12-09 16:23:47 -0800 Created attachment 44579 followup patch to workaround horribly painful and broken chromium/webkit processes. 170240 7 webkit.review.bot 2009-12-09 16:26:27 -0800 style-queue ran check-webkit-style on attachment 44579 without any errors. 170552 8 44579 commit-queue 2009-12-10 15:33:31 -0800 Comment on attachment 44579 followup patch to workaround horribly painful and broken chromium/webkit processes. Clearing flags on attachment: 44579 Committed r51967: <http://trac.webkit.org/changeset/51967> 175443 9 eric 2009-12-28 23:29:54 -0800 I'm confused as to if this should still be open or not? 175444 10 eric 2009-12-28 23:30:26 -0800 I believe this has been landed, so marking closed. Please re-open if I'm wrong. 44554 2009-12-09 12:17:19 -0800 2009-12-09 13:29:53 -0800 patch bug32336.patch text/plain 3672 mbelshe SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTE5MTApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTItMDkgIE1pa2Ug QmVsc2hlICA8bWlrZUBiZWxzaGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZp c2hlci4KKworICAgICAgICBGaXggRnJhbWVMb2FkZXIgdG8gdXNlIHRoZSBuZXcgUmVzb3VyY2VU eXBlcyBwcm9wZXJseS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzIzMzYKKworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXF1ZXN0Lmg6CisgICAg ICAgIChXZWJLaXQ6OldlYlVSTFJlcXVlc3Q6Oik6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVy Q2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OnNldFRhcmdldFR5cGVGcm9tTG9hZGVy KToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaFdpbGxT ZW5kUmVxdWVzdCk6CisKIDIwMDktMTItMDggIFN0dWFydCBNb3JnYW4gIDxzdHVhcnRtb3JnYW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVxdWVzdC5oCShyZXZpc2lvbiA1MTkwOCkKKysr IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBA IC01OCw4ICs1OCwxMiBAQCBwdWJsaWM6CiAKICAgICBlbnVtIFRhcmdldFR5cGUgewogICAgICAg ICBUYXJnZXRJc01haW5GcmFtZSwKLSAgICAgICAgVGFyZ2V0SXNTdWJGcmFtZSwKLSAgICAgICAg VGFyZ2V0SXNTdWJSZXNvdXJjZSwKKyAgICAgICAgVGFyZ2V0SXNTdWJmcmFtZSwKKyAgICAgICAg VGFyZ2V0SXNTdWJyZXNvdXJjZSwKKyAgICAgICAgVGFyZ2V0SXNTdHlsZVNoZWV0LAorICAgICAg ICBUYXJnZXRJc1NjcmlwdCwKKyAgICAgICAgVGFyZ2V0SXNGb250UmVzb3VyY2UsCisgICAgICAg IFRhcmdldElzSW1hZ2UsCiAgICAgICAgIFRhcmdldElzT2JqZWN0LAogICAgICAgICBUYXJnZXRJ c01lZGlhCiAgICAgfTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGll bnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVy Q2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDUxOTA4KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9G cmFtZUxvYWRlckNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzMsOCArMjMzLDgg QEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEltcGw6OmFzc2lnbklkZW50aQogICAgIH0KIH0KIAot Ly8gRGV0ZXJtaW5lcyB3aGV0aGVyIHRoZSByZXF1ZXN0IGJlaW5nIGxvYWRlZCBieSB8bG9hZGVy fCBpcyBhIGZyYW1lIG9yIGEKLS8vIHN1YnJlc291cmNlLiBBIHN1YnJlc291cmNlIGluIHRoaXMg Y29udGV4dCBpcyBhbnl0aGluZyBvdGhlciB0aGFuIGEgZnJhbWUgLS0KKy8vIElmIHRoZSByZXF1 ZXN0IGJlaW5nIGxvYWRlZCBieSB8bG9hZGVyfCBpcyBhIGZyYW1lLCB1cGRhdGUgdGhlIFJlc291 cmNlVHlwZS4KKy8vIEEgc3VicmVzb3VyY2UgaW4gdGhpcyBjb250ZXh0IGlzIGFueXRoaW5nIG90 aGVyIHRoYW4gYSBmcmFtZSAtLQogLy8gdGhpcyBpbmNsdWRlcyBpbWFnZXMgYW5kIHhtbGh0dHAg cmVxdWVzdHMuICBJdCBpcyBpbXBvcnRhbnQgdG8gbm90ZSB0aGF0IGEKIC8vIHN1YnJlc291cmNl IGlzIE5PVCBsaW1pdGVkIHRvIHN0dWZmIGxvYWRlZCB0aHJvdWdoIHRoZSBmcmFtZSdzIHN1YnJl c291cmNlCiAvLyBsb2FkZXIuIFN5bmNocm9ub3VzIHhtbGh0dHAgcmVxdWVzdHMgZm9yIGV4YW1w bGUsIGRvIG5vdCBnbyB0aHJvdWdoIHRoZQpAQCAtMjQyLDE0ICsyNDIsMTYgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudEltcGw6OmFzc2lnbklkZW50aQogLy8KIC8vIFRoZSBpbXBvcnRhbnQgZWRn ZSBjYXNlcyB0byBjb25zaWRlciB3aGVuIG1vZGlmeWluZyB0aGlzIGZ1bmN0aW9uIGFyZQogLy8g aG93IHN5bmNocm9ub3VzIHJlc291cmNlIGxvYWRzIGFyZSB0cmVhdGVkIGR1cmluZyBsb2FkL3Vu bG9hZCB0aHJlc2hvbGQuCi1zdGF0aWMgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRUeXBlIGRldGVy bWluZVRhcmdldFR5cGVGcm9tTG9hZGVyKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCitzdGF0aWMg dm9pZCBzZXRUYXJnZXRUeXBlRnJvbUxvYWRlcihSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIERv Y3VtZW50TG9hZGVyKiBsb2FkZXIpCiB7CiAgICAgaWYgKGxvYWRlciA9PSBsb2FkZXItPmZyYW1l TG9hZGVyKCktPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSkgeworICAgICAgICBSZXNvdXJj ZVJlcXVlc3Q6OlRhcmdldFR5cGUgdHlwZTsKICAgICAgICAgaWYgKGxvYWRlci0+ZnJhbWVMb2Fk ZXIoKS0+aXNMb2FkaW5nTWFpbkZyYW1lKCkpCi0gICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VS ZXF1ZXN0OjpUYXJnZXRJc01haW5GcmFtZTsKLSAgICAgICAgcmV0dXJuIFJlc291cmNlUmVxdWVz dDo6VGFyZ2V0SXNTdWJmcmFtZTsKKyAgICAgICAgICAgIHR5cGUgPSBSZXNvdXJjZVJlcXVlc3Q6 OlRhcmdldElzTWFpbkZyYW1lOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0eXBlID0gUmVz b3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1N1YmZyYW1lOworICAgICAgICByZXF1ZXN0LnNldFRhcmdl dFR5cGUodHlwZSk7CiAgICAgfQotICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElz U3VicmVzb3VyY2U7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaFdp bGxTZW5kUmVxdWVzdCgKQEAgLTI1OSw3ICsyNjEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50 SW1wbDo6ZGlzcGF0Y2hXaWxsCiAgICAgaWYgKGxvYWRlcikgewogICAgICAgICAvLyBXZSB3YW50 IHRvIGRpc3Rpbmd1aXNoIGJldHdlZW4gYSByZXF1ZXN0IGZvciBhIGRvY3VtZW50IHRvIGJlIGxv YWRlZCBpbnRvCiAgICAgICAgIC8vIHRoZSBtYWluIGZyYW1lLCBhIHN1Yi1mcmFtZSwgb3IgdGhl IHN1Yi1vYmplY3RzIGluIHRoYXQgZG9jdW1lbnQuCi0gICAgICAgIHJlcXVlc3Quc2V0VGFyZ2V0 VHlwZShkZXRlcm1pbmVUYXJnZXRUeXBlRnJvbUxvYWRlcihsb2FkZXIpKTsKKyAgICAgICAgc2V0 VGFyZ2V0VHlwZUZyb21Mb2FkZXIocmVxdWVzdCwgbG9hZGVyKSk7CiAKICAgICAgICAgLy8gQXZv aWQgcmVwZWF0aW5nIGEgZm9ybSBzdWJtaXNzaW9uIHdoZW4gbmF2aWdhdGluZyBiYWNrIG9yIGZv cndhcmQuCiAgICAgICAgIGlmIChsb2FkZXIgPT0gbG9hZGVyLT5mcmFtZUxvYWRlcigpLT5wcm92 aXNpb25hbERvY3VtZW50TG9hZGVyKCkK 44579 2009-12-09 16:23:47 -0800 2009-12-10 15:33:31 -0800 followup patch to workaround horribly painful and broken chromium/webkit processes. bug32336a.patch text/plain 3979 mbelshe SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTE5MTApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTItMDkgIE1pa2Ug QmVsc2hlICA8bWlrZUBiZWxzaGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZp c2hlci4KKworICAgICAgICBGaXggRnJhbWVMb2FkZXIgdG8gdXNlIHRoZSBuZXcgUmVzb3VyY2VU eXBlcyBwcm9wZXJseS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzIzMzYKKworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXF1ZXN0Lmg6CisgICAg ICAgIChXZWJLaXQ6OldlYlVSTFJlcXVlc3Q6Oik6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVy Q2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OnNldFRhcmdldFR5cGVGcm9tTG9hZGVy KToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaFdpbGxT ZW5kUmVxdWVzdCk6CisKIDIwMDktMTItMDggIFN0dWFydCBNb3JnYW4gIDxzdHVhcnRtb3JnYW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVxdWVzdC5oCShyZXZpc2lvbiA1MTkwOCkKKysr IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBA IC01NywxMSArNTcsMTcgQEAgcHVibGljOgogICAgIH07CiAKICAgICBlbnVtIFRhcmdldFR5cGUg ewotICAgICAgICBUYXJnZXRJc01haW5GcmFtZSwKLSAgICAgICAgVGFyZ2V0SXNTdWJGcmFtZSwK LSAgICAgICAgVGFyZ2V0SXNTdWJSZXNvdXJjZSwKLSAgICAgICAgVGFyZ2V0SXNPYmplY3QsCi0g ICAgICAgIFRhcmdldElzTWVkaWEKKyAgICAgICAgVGFyZ2V0SXNNYWluRnJhbWUgPSAwLAorICAg ICAgICBUYXJnZXRJc1N1YkZyYW1lID0gMSwgICAvLyBUZW1wb3JhcnkgZm9yIGJhY2t3YXJkIGNv bXBhdGliaWxpdHkuCisgICAgICAgIFRhcmdldElzU3ViZnJhbWUgPSAxLAorICAgICAgICBUYXJn ZXRJc1N1YlJlc291cmNlID0gMiwgIC8vIFRlbXBvcmFyeSBmb3IgYmFja3dhcmQgY29tcHRpYmls aXR5LgorICAgICAgICBUYXJnZXRJc1N1YnJlc291cmNlID0gMiwKKyAgICAgICAgVGFyZ2V0SXNT dHlsZVNoZWV0ID0gMywKKyAgICAgICAgVGFyZ2V0SXNTY3JpcHQgPSA0LAorICAgICAgICBUYXJn ZXRJc0ZvbnRSZXNvdXJjZSA9IDUsCisgICAgICAgIFRhcmdldElzSW1hZ2UgPSA2LAorICAgICAg ICBUYXJnZXRJc09iamVjdCA9IDcsCisgICAgICAgIFRhcmdldElzTWVkaWEgPSA4CiAgICAgfTsK IAogICAgIH5XZWJVUkxSZXF1ZXN0KCkgeyByZXNldCgpOyB9CkluZGV4OiBXZWJLaXQvY2hyb21p dW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA1MTkwOCkKKysr IFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjMzLDggKzIzMyw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjphc3Np Z25JZGVudGkKICAgICB9CiB9CiAKLS8vIERldGVybWluZXMgd2hldGhlciB0aGUgcmVxdWVzdCBi ZWluZyBsb2FkZWQgYnkgfGxvYWRlcnwgaXMgYSBmcmFtZSBvciBhCi0vLyBzdWJyZXNvdXJjZS4g QSBzdWJyZXNvdXJjZSBpbiB0aGlzIGNvbnRleHQgaXMgYW55dGhpbmcgb3RoZXIgdGhhbiBhIGZy YW1lIC0tCisvLyBJZiB0aGUgcmVxdWVzdCBiZWluZyBsb2FkZWQgYnkgfGxvYWRlcnwgaXMgYSBm cmFtZSwgdXBkYXRlIHRoZSBSZXNvdXJjZVR5cGUuCisvLyBBIHN1YnJlc291cmNlIGluIHRoaXMg Y29udGV4dCBpcyBhbnl0aGluZyBvdGhlciB0aGFuIGEgZnJhbWUgLS0KIC8vIHRoaXMgaW5jbHVk ZXMgaW1hZ2VzIGFuZCB4bWxodHRwIHJlcXVlc3RzLiAgSXQgaXMgaW1wb3J0YW50IHRvIG5vdGUg dGhhdCBhCiAvLyBzdWJyZXNvdXJjZSBpcyBOT1QgbGltaXRlZCB0byBzdHVmZiBsb2FkZWQgdGhy b3VnaCB0aGUgZnJhbWUncyBzdWJyZXNvdXJjZQogLy8gbG9hZGVyLiBTeW5jaHJvbm91cyB4bWxo dHRwIHJlcXVlc3RzIGZvciBleGFtcGxlLCBkbyBub3QgZ28gdGhyb3VnaCB0aGUKQEAgLTI0Miwx NCArMjQyLDE2IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjphc3NpZ25JZGVudGkKIC8v CiAvLyBUaGUgaW1wb3J0YW50IGVkZ2UgY2FzZXMgdG8gY29uc2lkZXIgd2hlbiBtb2RpZnlpbmcg dGhpcyBmdW5jdGlvbiBhcmUKIC8vIGhvdyBzeW5jaHJvbm91cyByZXNvdXJjZSBsb2FkcyBhcmUg dHJlYXRlZCBkdXJpbmcgbG9hZC91bmxvYWQgdGhyZXNob2xkLgotc3RhdGljIFJlc291cmNlUmVx dWVzdDo6VGFyZ2V0VHlwZSBkZXRlcm1pbmVUYXJnZXRUeXBlRnJvbUxvYWRlcihEb2N1bWVudExv YWRlciogbG9hZGVyKQorc3RhdGljIHZvaWQgc2V0VGFyZ2V0VHlwZUZyb21Mb2FkZXIoUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBEb2N1bWVudExvYWRlciogbG9hZGVyKQogewogICAgIGlmIChs b2FkZXIgPT0gbG9hZGVyLT5mcmFtZUxvYWRlcigpLT5wcm92aXNpb25hbERvY3VtZW50TG9hZGVy KCkpIHsKKyAgICAgICAgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRUeXBlIHR5cGU7CiAgICAgICAg IGlmIChsb2FkZXItPmZyYW1lTG9hZGVyKCktPmlzTG9hZGluZ01haW5GcmFtZSgpKQotICAgICAg ICAgICAgcmV0dXJuIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNNYWluRnJhbWU7Ci0gICAgICAg IHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzU3ViZnJhbWU7CisgICAgICAgICAgICB0 eXBlID0gUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc01haW5GcmFtZTsKKyAgICAgICAgZWxzZQor ICAgICAgICAgICAgdHlwZSA9IFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNTdWJmcmFtZTsKKyAg ICAgICAgcmVxdWVzdC5zZXRUYXJnZXRUeXBlKHR5cGUpOwogICAgIH0KLSAgICByZXR1cm4gUmVz b3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1N1YnJlc291cmNlOwogfQogCiB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50SW1wbDo6ZGlzcGF0Y2hXaWxsU2VuZFJlcXVlc3QoCkBAIC0yNTksNyArMjYxLDcgQEAg dm9pZCBGcmFtZUxvYWRlckNsaWVudEltcGw6OmRpc3BhdGNoV2lsbAogICAgIGlmIChsb2FkZXIp IHsKICAgICAgICAgLy8gV2Ugd2FudCB0byBkaXN0aW5ndWlzaCBiZXR3ZWVuIGEgcmVxdWVzdCBm b3IgYSBkb2N1bWVudCB0byBiZSBsb2FkZWQgaW50bwogICAgICAgICAvLyB0aGUgbWFpbiBmcmFt ZSwgYSBzdWItZnJhbWUsIG9yIHRoZSBzdWItb2JqZWN0cyBpbiB0aGF0IGRvY3VtZW50LgotICAg ICAgICByZXF1ZXN0LnNldFRhcmdldFR5cGUoZGV0ZXJtaW5lVGFyZ2V0VHlwZUZyb21Mb2FkZXIo bG9hZGVyKSk7CisgICAgICAgIHNldFRhcmdldFR5cGVGcm9tTG9hZGVyKHJlcXVlc3QsIGxvYWRl cikpOwogCiAgICAgICAgIC8vIEF2b2lkIHJlcGVhdGluZyBhIGZvcm0gc3VibWlzc2lvbiB3aGVu IG5hdmlnYXRpbmcgYmFjayBvciBmb3J3YXJkLgogICAgICAgICBpZiAobG9hZGVyID09IGxvYWRl ci0+ZnJhbWVMb2FkZXIoKS0+cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcigpCg==