48476 2010-10-27 15:27:40 -0700 ResourceRequest targetType set to Subresource for main frame and subframe loads 2011-09-14 11:31:25 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 48483 0 joenotcharles webkit-unassigned abarth ap dbates jochen staikos oldest_to_newest 300630 0 joenotcharles 2010-10-27 15:27:40 -0700 ResourceRequestBase::targetType was added for the Chrome port and moved into cross-platform WebCore in svn 51859. But, it is only initialized to a resource type in PingLoader::loadImage, PingLoader::sendPing, WorkerScriptLoader::createResourceRequest, and cachedResourceTypeToTargetType in loader.cpp - all of which only deal with subresources. For ResourceRequest's created to do top-level loads (into a main frame or subframe), it's left as the default of TargetIsSubresource. This isn't just underspecified, it's clearly wrong - target type should be TargetIsMainFrame or TargetIsSubframe. As far as I know nobody actually checks targetType for non-subresources at the moment, so this is not critical. But this information would be useful or clients to have, for instance in dispatchDecidePolicyForNavigationAction to make different decisions when loading a main frame vs loading a subframe. The attached patch sets the targetType whenever a ResourceRequest is created. No tests yet since I'd like to get a second opinion on whether this is the right approach before spending more time getting it ready for submission. 300635 1 72095 joenotcharles 2010-10-27 15:29:47 -0700 Created attachment 72095 initial patch: looking for comments 300640 2 72095 abarth 2010-10-27 15:35:12 -0700 Comment on attachment 72095 initial patch: looking for comments View in context: https://bugs.webkit.org/attachment.cgi?id=72095&action=review > WebCore/loader/FrameLoader.cpp:178 > + Page* page = frame->page(); > + if (page && frame == page->mainFrame()) I'm not sure this is the right way to test this condition. Maybe try frame->tree()->parent() is null? You'll have to test what happens with a detached frame. 300647 3 ap 2010-10-27 15:38:47 -0700 I don't think we should be accepting any changes to ResourceRequest::m_targetType other than the change that will remove it for good. 300656 4 abarth 2010-10-27 15:49:17 -0700 > I don't think we should be accepting any changes to ResourceRequest::m_targetType other than the change that will remove it for good. What's involved in removing it? (My box is busy running a test suite.) 300687 5 joenotcharles 2010-10-27 16:27:30 -0700 (In reply to comment #4) > > I don't think we should be accepting any changes to ResourceRequest::m_targetType other than the change that will remove it for good. > > What's involved in removing it? (My box is busy running a test suite.) Basically revert svn commit 51859, which moved it out of chromium into cross-platform code, and fix any build failures that result due to later patches making use of it. The Blackberry port which we're starting to upstream makes use of it, though, so if you get rid of it we'll need to duplicate it in the platform layer. 300699 6 ap 2010-10-27 16:39:54 -0700 I've filed bug 48483 to have a place of its own for that discussion. 300766 7 joenotcharles 2010-10-27 18:16:05 -0700 If this patch is too intrusive, until we resolve bug 48483 I suggest adding a TargetIsUnknown type and defaulting to that instead of TargetIsSubresource. That way at least for toplevel resources it will be unset instead of wrong. 300769 8 abarth 2010-10-27 18:24:51 -0700 It's not the intrusiveness we're worried about. We need to sort out the overall direction for this part of the code before we can figure out what to do in this particular case. 467059 9 joenotcharles 2011-09-14 09:14:43 -0700 I think this is obsoleted by the removal of target type in bug 48483. 467172 10 jochen 2011-09-14 11:31:25 -0700 (In reply to comment #9) > I think this is obsoleted by the removal of target type in bug 48483. I intend to move the targetType to the right layer. While it's temporarily only available on the chromium port, I hope to resurface it once we've figured out how to do this without a layering violation. 72095 2010-10-27 15:29:47 -0700 2010-10-27 15:35:12 -0700 initial patch: looking for comments 0001-WebCore.patch text/plain 13594 joenotcharles RnJvbSBjOTM1OWZiNThiNzY4MDVmN2JjNzQyYTQyODFkODQyMGZlYWIzNzBjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBUaHUs IDEgSnVsIDIwMTAgMDM6NTU6MTIgLTA0MDAKU3ViamVjdDogW1BBVENIXSBXZWJDb3JlOgoKMjAx MC0wNy0wMSAgSm9lIE1hc29uICA8am1hc29uQHJpbS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQ4NDc2CgogICAgICAgIFNldCB0aGUgdGFyZ2V0VHlwZSB0byBUYXJnZXRJc01haW5G cmFtZSBvciBUYXJnZXRJc1N1YmZyYW1lIGFzCiAgICAgICAgYXBwcm9wcmlhdGUgd2hlbmV2ZXIg Y3JlYXRpbmcgYSBSZXNvdXJjZVJlcXVlc3QgdGhhdCBpcyBub3QgZm9yIGEKICAgICAgICBzdWJy ZXNvdXJjZS4gIChFeGNlcHQgZm9yIHJlcXVlc3RzIHRoYXQgYXJlIHJldHJpZXZlZCBmcm9tIHRo ZSBtZW1vcnkKICAgICAgICBjYWNoZSAtIGdvaW5nIHRocm91Z2ggRnJhbWVMb2FkZXI6OnJlcXVl c3RGcm9tRGVsZWdhdGUgLSBvciBhcHBjYWNoZSAtCiAgICAgICAgZ29pbmcgdGhyb3VnaCBBcHBs aWNhdGlvbkNhY2hlR3JvdXA6OmNyZWF0ZVJlc291cmNlSGFuZGxlIC0gc2luY2UgaXQgaXMKICAg ICAgICBoYXJkIHRvIGRpc3Rpbmd1aXNoIHN1YnJlc291cmNlIHJlcXVlc3RzIGZyb20gdG9wIGxl dmVsIHJlcXVlc3RzIG9uCiAgICAgICAgdGhlc2UgY29kZSBwYXRocyB3aXRob3V0IHJlZmFjdG9y aW5nLikKCiAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcDoKICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjptYWtlQ3Jvc3NPcmlnaW5B Y2Nlc3NSZXF1ZXN0V2l0aFByZWZsaWdodCk6IEluaXRpYWxpemUgcmVxdWVzdCB0YXJnZXRUeXBl CiAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgogICAgICAgIChXZWJDb3JlOjp0YXJn ZXRUeXBlRm9yRnJhbWUpOiBBZGRlZAogICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2hh bmdlTG9jYXRpb24pOiBJbml0aWFsaXplIHJlcXVlc3QgdGFyZ2V0VHlwZQogICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6bG9hZEFyY2hpdmUpOiBJbml0aWFsaXplIHJlcXVlc3QgdGFyZ2V0 VHlwZQogICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFVSTCk6IEluaXRpYWxpemUg cmVxdWVzdCB0YXJnZXRUeXBlCiAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkUG9z dFJlcXVlc3QpOiBJbml0aWFsaXplIHJlcXVlc3QgdGFyZ2V0VHlwZQogICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6bmF2aWdhdGVUb0RpZmZlcmVudERvY3VtZW50KTogSW5pdGlhbGl6ZSBy ZXF1ZXN0IHRhcmdldFR5cGUKICAgICAgICAqIHBhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNw cDoKICAgICAgICAoV2ViQ29yZTo6b3Blbk5ld1dpbmRvdyk6IEluaXRpYWxpemUgcmVxdWVzdCB0 YXJnZXRUeXBlCiAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJvbGxlcjo6Y29udGV4 dE1lbnVJdGVtU2VsZWN0ZWQpOkluaXRpYWxpemUgcmVxdWVzdCB0YXJnZXRUeXBlCiAgICAgICAg KiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoKICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xs ZXI6OnBlcmZvcm1EcmFnKTogSW5pdGlhbGl6ZSByZXF1ZXN0IHRhcmdldFR5cGUKICAgICAgICAq IHBsYXRmb3JtL0NvbnRleHRNZW51LmNwcDoKICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnU6 OnBvcHVsYXRlKTogSW5pdGlhbGl6ZSByZXF1ZXN0IHRhcmdldFR5cGUKICAgICAgICAqIHdtbC9X TUxHb0VsZW1lbnQuY3BwOgogICAgICAgIChXZWJDb3JlOjpXTUxHb0VsZW1lbnQ6OmV4ZWN1dGVU YXNrKTogSW5pdGlhbGl6ZSByZXF1ZXN0IHRhcmdldFR5cGUKLS0tCiBXZWJDb3JlL2xvYWRlci9E b2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwIHwgICAgMiArCiBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAgICAgICAgICAgICAgIHwgICAzMCArKysrKysrKysrKysrKysrKysrKysrKy0t LQogV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAgICAgICB8ICAgMTcgKysr KysrKysrKystLS0KIFdlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgICAgICAgICAgICAg fCAgICA1ICsrKy0KIFdlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuY3BwICAgICAgICAgICAg fCAgICA5ICsrKysrKy0KIFdlYkNvcmUvd21sL1dNTEdvRWxlbWVudC5jcHAgICAgICAgICAgICAg ICAgfCAgICAyICsKIDYgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9h ZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKaW5k ZXggYTc5MjE0NC4uYjcwZjg2MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRU aHJlYWRhYmxlTG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFi bGVMb2FkZXIuY3BwCkBAIC0xLDUgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwOSBH b29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSBSZXNlYXJj aCBJbiBNb3Rpb24gTGltaXRlZCAyMDEwLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMTI0LDYgKzEyNSw3IEBAIHZvaWQgRG9jdW1l bnRUaHJlYWRhYmxlTG9hZGVyOjptYWtlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0V2l0aFByZWZs aWdodChjb25zdCBSCiAgICAgcHJlZmxpZ2h0UmVxdWVzdC5zZXRBbGxvd0Nvb2tpZXMobV9vcHRp b25zLmFsbG93Q3JlZGVudGlhbHMpOwogICAgIHByZWZsaWdodFJlcXVlc3Quc2V0SFRUUE1ldGhv ZCgiT1BUSU9OUyIpOwogICAgIHByZWZsaWdodFJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKCJB Y2Nlc3MtQ29udHJvbC1SZXF1ZXN0LU1ldGhvZCIsIHJlcXVlc3QuaHR0cE1ldGhvZCgpKTsKKyAg ICBwcmVmbGlnaHRSZXF1ZXN0LnNldFRhcmdldFR5cGUocmVxdWVzdC50YXJnZXRUeXBlKCkpOwog CiAgICAgY29uc3QgSFRUUEhlYWRlck1hcCYgcmVxdWVzdEhlYWRlckZpZWxkcyA9IHJlcXVlc3Qu aHR0cEhlYWRlckZpZWxkcygpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggOTQwZTc3MC4u NWVlYjhkZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBi L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTcyLDYgKzE3MiwxNCBAQCBzdGF0 aWMgYm9vbCBpc0RvY3VtZW50U2FuZGJveGVkKEZyYW1lKiBmcmFtZSwgU2FuZGJveEZsYWdzIG1h c2spCiAgICAgcmV0dXJuIGZyYW1lLT5kb2N1bWVudCgpICYmIGZyYW1lLT5kb2N1bWVudCgpLT5z ZWN1cml0eU9yaWdpbigpLT5pc1NhbmRib3hlZChtYXNrKTsKIH0KIAorc3RhdGljIGlubGluZSBS ZXNvdXJjZVJlcXVlc3Q6OlRhcmdldFR5cGUgdGFyZ2V0VHlwZUZvckZyYW1lKEZyYW1lKiBmcmFt ZSkKK3sKKyAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAocGFnZSAmJiBm cmFtZSA9PSBwYWdlLT5tYWluRnJhbWUoKSkKKyAgICAgICAgcmV0dXJuIFJlc291cmNlUmVxdWVz dDo6VGFyZ2V0SXNNYWluRnJhbWU7CisgICAgcmV0dXJuIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0 SXNTdWJmcmFtZTsKK30KKwogRnJhbWVMb2FkZXI6OkZyYW1lTG9hZGVyKEZyYW1lKiBmcmFtZSwg RnJhbWVMb2FkZXJDbGllbnQqIGNsaWVudCkKICAgICA6IG1fZnJhbWUoZnJhbWUpCiAgICAgLCBt X2NsaWVudChjbGllbnQpCkBAIC0yNjksNiArMjc3LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2hh bmdlTG9jYXRpb24oY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBib29s IGwKICAgICBSZWZQdHI8RnJhbWU+IHByb3RlY3QobV9mcmFtZSk7CiAKICAgICBSZXNvdXJjZVJl cXVlc3QgcmVxdWVzdCh1cmwsIHJlZmVycmVyLCByZWZyZXNoID8gUmVsb2FkSWdub3JpbmdDYWNo ZURhdGEgOiBVc2VQcm90b2NvbENhY2hlUG9saWN5KTsKKyAgICByZXF1ZXN0LnNldFRhcmdldFR5 cGUodGFyZ2V0VHlwZUZvckZyYW1lKG1fZnJhbWUpKTsKICAgICAKICAgICB1cmxTZWxlY3RlZChy ZXF1ZXN0LCAiX3NlbGYiLCAwLCBsb2NrSGlzdG9yeSwgbG9ja0JhY2tGb3J3YXJkTGlzdCwgU2Vu ZFJlZmVycmVyLCBSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpOwogfQpAQCAtOTYxLDYg Kzk3MCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRBcmNoaXZlKFBhc3NSZWZQdHI8QXJjaGl2 ZT4gcHJwQXJjaGl2ZSkKICNpZiBQTEFURk9STShNQUMpCiAgICAgcmVxdWVzdC5hcHBseVdlYkFy Y2hpdmVIYWNrRm9yTWFpbCgpOwogI2VuZGlmCisgICAgcmVxdWVzdC5zZXRUYXJnZXRUeXBlKHRh cmdldFR5cGVGb3JGcmFtZShtX2ZyYW1lKSk7CiAKICAgICBSZWZQdHI8RG9jdW1lbnRMb2FkZXI+ IGRvY3VtZW50TG9hZGVyID0gbV9jbGllbnQtPmNyZWF0ZURvY3VtZW50TG9hZGVyKHJlcXVlc3Qs IHN1YnN0aXR1dGVEYXRhKTsKICAgICBkb2N1bWVudExvYWRlci0+YWRkQWxsQXJjaGl2ZVJlc291 cmNlcyhhcmNoaXZlLmdldCgpKTsKQEAgLTEzMjIsMTEgKzEzMzIsMTUgQEAgdm9pZCBGcmFtZUxv YWRlcjo6bG9hZFVSTChjb25zdCBLVVJMJiBuZXdVUkwsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIs IGNvbnN0IFN0cmkKICAgICBOYXZpZ2F0aW9uQWN0aW9uIGFjdGlvbihuZXdVUkwsIG5ld0xvYWRU eXBlLCBpc0Zvcm1TdWJtaXNzaW9uLCBldmVudCk7CiAKICAgICBpZiAoIXRhcmdldEZyYW1lICYm ICFmcmFtZU5hbWUuaXNFbXB0eSgpKSB7CisgICAgICAgIC8vIG9wZW5pbmcgYSBuZXcgd2luZG93 LCBzbyB0YXJnZXQgaXMgbm90IGEgc3ViZnJhbWUKKyAgICAgICAgcmVxdWVzdC5zZXRUYXJnZXRU eXBlKFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNNYWluRnJhbWUpOwogICAgICAgICBwb2xpY3lD aGVja2VyKCktPmNoZWNrTmV3V2luZG93UG9saWN5KGFjdGlvbiwgRnJhbWVMb2FkZXI6OmNhbGxD b250aW51ZUxvYWRBZnRlck5ld1dpbmRvd1BvbGljeSwKICAgICAgICAgICAgIHJlcXVlc3QsIGZv cm1TdGF0ZS5yZWxlYXNlKCksIGZyYW1lTmFtZSwgdGhpcyk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKKyAgICByZXF1ZXN0LnNldFRhcmdldFR5cGUodGFyZ2V0VHlwZUZvckZyYW1lKHRhcmdl dEZyYW1lID8gdGFyZ2V0RnJhbWUgOiBtX2ZyYW1lKSk7CisKICAgICBSZWZQdHI8RG9jdW1lbnRM b2FkZXI+IG9sZERvY3VtZW50TG9hZGVyID0gbV9kb2N1bWVudExvYWRlcjsKIAogICAgIGJvb2wg c2FtZVVSTCA9IHNob3VsZFRyZWF0VVJMQXNTYW1lQXNDdXJyZW50KG5ld1VSTCk7CkBAIC0yNzM4 LDEyICsyNzUyLDE4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRQb3N0UmVxdWVzdChjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIGluUmVxdWVzdCwgY29uc3QgU3RyaW5nCiAKICAgICBpZiAoIWZyYW1l TmFtZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gVGhlIHNlYXJjaCBmb3IgYSB0YXJnZXQgZnJh bWUgaXMgZG9uZSBlYXJsaWVyIGluIHRoZSBjYXNlIG9mIGZvcm0gc3VibWlzc2lvbi4KLSAgICAg ICAgaWYgKEZyYW1lKiB0YXJnZXRGcmFtZSA9IGZvcm1TdGF0ZSA/IDAgOiBmaW5kRnJhbWVGb3JO YXZpZ2F0aW9uKGZyYW1lTmFtZSkpCisgICAgICAgIGlmIChGcmFtZSogdGFyZ2V0RnJhbWUgPSBm b3JtU3RhdGUgPyAwIDogZmluZEZyYW1lRm9yTmF2aWdhdGlvbihmcmFtZU5hbWUpKSB7CisgICAg ICAgICAgICB3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LnNldFRhcmdldFR5cGUodGFyZ2V0VHlwZUZv ckZyYW1lKHRhcmdldEZyYW1lKSk7CiAgICAgICAgICAgICB0YXJnZXRGcmFtZS0+bG9hZGVyKCkt PmxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbih3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBhY3Rpb24s IGxvY2tIaXN0b3J5LCBsb2FkVHlwZSwgZm9ybVN0YXRlLnJlbGVhc2UoKSk7Ci0gICAgICAgIGVs c2UKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIG9wZW5pbmcgYSBuZXcgd2luZG93 LCBzbyB0YXJnZXQgaXMgbm90IGEgc3ViZnJhbWUKKyAgICAgICAgICAgIHdvcmtpbmdSZXNvdXJj ZVJlcXVlc3Quc2V0VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzTWFpbkZyYW1l KTsKICAgICAgICAgICAgIHBvbGljeUNoZWNrZXIoKS0+Y2hlY2tOZXdXaW5kb3dQb2xpY3koYWN0 aW9uLCBGcmFtZUxvYWRlcjo6Y2FsbENvbnRpbnVlTG9hZEFmdGVyTmV3V2luZG93UG9saWN5LCB3 b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBmb3JtU3RhdGUucmVsZWFzZSgpLCBmcmFtZU5hbWUsIHRo aXMpOwotICAgIH0gZWxzZQotICAgICAgICBsb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24od29ya2lu Z1Jlc291cmNlUmVxdWVzdCwgYWN0aW9uLCBsb2NrSGlzdG9yeSwgbG9hZFR5cGUsIGZvcm1TdGF0 ZS5yZWxlYXNlKCkpOyAgICAKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIHdvcmtp bmdSZXNvdXJjZVJlcXVlc3Quc2V0VGFyZ2V0VHlwZSh0YXJnZXRUeXBlRm9yRnJhbWUobV9mcmFt ZSkpOworICAgICAgICBsb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24od29ya2luZ1Jlc291cmNlUmVx dWVzdCwgYWN0aW9uLCBsb2NrSGlzdG9yeSwgbG9hZFR5cGUsIGZvcm1TdGF0ZS5yZWxlYXNlKCkp OworICAgIH0KIH0KIAogdW5zaWduZWQgbG9uZyBGcmFtZUxvYWRlcjo6bG9hZFJlc291cmNlU3lu Y2hyb25vdXNseShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFN0b3JlZENyZWRlbnRp YWxzIHN0b3JlZENyZWRlbnRpYWxzLCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSkKQEAgLTMxNzAsNiArMzE5MCw4IEBA IHZvaWQgRnJhbWVMb2FkZXI6Om5hdmlnYXRlVG9EaWZmZXJlbnREb2N1bWVudChIaXN0b3J5SXRl bSogaXRlbSwgRnJhbWVMb2FkVHlwZSBsCiAgICAgYm9vbCBhZGRlZEV4dHJhRmllbGRzID0gZmFs c2U7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoaXRlbVVSTCk7CiAKKyAgICByZXF1ZXN0 LnNldFRhcmdldFR5cGUodGFyZ2V0VHlwZUZvckZyYW1lKG1fZnJhbWUpKTsKKwogICAgIGlmICgh aXRlbS0+cmVmZXJyZXIoKS5pc051bGwoKSkKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJy ZXIoaXRlbS0+cmVmZXJyZXIoKSk7CiAgICAgCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvQ29u dGV4dE1lbnVDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xs ZXIuY3BwCmluZGV4IDA4YzNkMmUuLmRkMzkxMDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9D b250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNv bnRyb2xsZXIuY3BwCkBAIC0xLDYgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNiwg MjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MTAgSWdhbGlhIFMuTAorICogQ29weXJpZ2h0IChDKSBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRl ZCAyMDEwLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0xNDAsNyArMTQxLDkgQEAgc3RhdGljIHZvaWQgb3Blbk5ld1dpbmRvdyhjb25zdCBL VVJMJiB1cmxUb0xvYWQsIEZyYW1lKiBmcmFtZSkKIHsKICAgICBpZiAoUGFnZSogb2xkUGFnZSA9 IGZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAgV2luZG93RmVhdHVyZXMgZmVhdHVyZXM7Ci0gICAg ICAgIGlmIChQYWdlKiBuZXdQYWdlID0gb2xkUGFnZS0+Y2hyb21lKCktPmNyZWF0ZVdpbmRvdyhm cmFtZSwgRnJhbWVMb2FkUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QodXJsVG9Mb2FkLCBmcmFtZS0+ bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSkpLCBmZWF0dXJlcywgTmF2aWdhdGlvbkFjdGlv bigpKSkKKyAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QodXJsVG9Mb2FkLCBmcmFtZS0+ bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSk7CisgICAgICAgIHJlcXVlc3Quc2V0VGFyZ2V0 VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzTWFpbkZyYW1lKTsKKyAgICAgICAgaWYgKFBh Z2UqIG5ld1BhZ2UgPSBvbGRQYWdlLT5jaHJvbWUoKS0+Y3JlYXRlV2luZG93KGZyYW1lLCBGcmFt ZUxvYWRSZXF1ZXN0KHJlcXVlc3QpLCBmZWF0dXJlcywgTmF2aWdhdGlvbkFjdGlvbigpKSkKICAg ICAgICAgICAgIG5ld1BhZ2UtPmNocm9tZSgpLT5zaG93KCk7CiAgICAgfQogfQpAQCAtMjcxLDkg KzI3NCwxNSBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6Y29udGV4dE1lbnVJdGVtU2Vs ZWN0ZWQoQ29udGV4dE1lbnVJdGVtKiBpdGVtKQogICAgICAgICBtX2NsaWVudC0+bG9va1VwSW5E aWN0aW9uYXJ5KGZyYW1lKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0 ZW1UYWdPcGVuTGluazoKLSAgICAgICAgaWYgKEZyYW1lKiB0YXJnZXRGcmFtZSA9IHJlc3VsdC50 YXJnZXRGcmFtZSgpKQotICAgICAgICAgICAgdGFyZ2V0RnJhbWUtPmxvYWRlcigpLT5sb2FkRnJh bWVSZXF1ZXN0KEZyYW1lTG9hZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KHJlc3VsdC5hYnNvbHV0 ZUxpbmtVUkwoKSwgZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpKSwgZmFsc2Us IGZhbHNlLCAwLCAwLCBTZW5kUmVmZXJyZXIpOwotICAgICAgICBlbHNlCisgICAgICAgIGlmIChG cmFtZSogdGFyZ2V0RnJhbWUgPSByZXN1bHQudGFyZ2V0RnJhbWUoKSkgeworICAgICAgICAgICAg UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QocmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+ bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSk7CisgICAgICAgICAgICBQYWdlKiBwYWdlID0g dGFyZ2V0RnJhbWUtPnBhZ2UoKTsKKyAgICAgICAgICAgIGlmIChwYWdlICYmIHRhcmdldEZyYW1l ID09IHBhZ2UtPm1haW5GcmFtZSgpKQorICAgICAgICAgICAgICAgIHJlcXVlc3Quc2V0VGFyZ2V0 VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzTWFpbkZyYW1lKTsKKyAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICByZXF1ZXN0LnNldFRhcmdldFR5cGUoUmVzb3VyY2VSZXF1ZXN0 OjpUYXJnZXRJc1N1YmZyYW1lKTsKKyAgICAgICAgICAgIHRhcmdldEZyYW1lLT5sb2FkZXIoKS0+ bG9hZEZyYW1lUmVxdWVzdChGcmFtZUxvYWRSZXF1ZXN0KHJlcXVlc3QpLCBmYWxzZSwgZmFsc2Us IDAsIDAsIFNlbmRSZWZlcnJlcik7CisgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgb3Blbk5l d1dpbmRvdyhyZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCksIGZyYW1lKTsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdCb2xkOgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w YWdlL0RyYWdDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAK aW5kZXggMmU3ZDI0MS4uZWMwOGE4NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0RyYWdDb250 cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCkBAIC0xLDUg KzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOSwgMjAxMCBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIFJlc2VhcmNoIEluIE1vdGlv biBMaW1pdGVkIDIwMTAuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKQEAgLTIxNCw3ICsyMTUsOSBAQCBib29sIERyYWdDb250cm9sbGVyOjpwZXJm b3JtRHJhZyhEcmFnRGF0YSogZHJhZ0RhdGEpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IG1fY2xpZW50LT53aWxsUGVyZm9ybURyYWdEZXN0aW5hdGlvbkFjdGlvbihEcmFnRGVzdGluYXRp b25BY3Rpb25Mb2FkLCBkcmFnRGF0YSk7Ci0gICAgbV9wYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVy KCktPmxvYWQoUmVzb3VyY2VSZXF1ZXN0KGRyYWdEYXRhLT5hc1VSTCgpKSwgZmFsc2UpOworICAg IFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KGRyYWdEYXRhLT5hc1VSTCgpKTsKKyAgICByZXF1ZXN0 LnNldFRhcmdldFR5cGUoUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc01haW5GcmFtZSk7CisgICAg bV9wYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPmxvYWQocmVxdWVzdCwgZmFsc2UpOwogICAg IHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRN ZW51LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuY3BwCmluZGV4IDM2OWY5Y2Uu LmYyMDViZDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuY3BwCkBAIC0yLDYgKzIsNyBAQAogICog Q29weXJpZ2h0IChDKSAyMDA2LCAyMDA3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqIENvcHlyaWdodCAoQykgMjAwOCBDaHJpc3RpYW4gRHl3YW4gPGNocmlzdGlhbkBpbWVuZGlv LmNvbT4KICAqIENvcHlyaWdodCAoQykgMjAxMCBJZ2FsaWEgUy5MCisgKiBDb3B5cmlnaHQgKEMp IFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkIDIwMTAuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg KgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM0NCw3ICszNDUsOSBAQCB2b2lkIENv bnRleHRNZW51Ojpwb3B1bGF0ZSgpCiAgICAgICAgIEZyYW1lTG9hZGVyKiBsb2FkZXIgPSBmcmFt ZS0+bG9hZGVyKCk7CiAgICAgICAgIEtVUkwgbGlua1VSTCA9IHJlc3VsdC5hYnNvbHV0ZUxpbmtV UkwoKTsKICAgICAgICAgaWYgKCFsaW5rVVJMLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgaWYg KGxvYWRlci0+Y2FuSGFuZGxlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QobGlua1VSTCkpKSB7Cisg ICAgICAgICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChsaW5rVVJMKTsKKyAgICAgICAgICAg IHJlcXVlc3Quc2V0VGFyZ2V0VHlwZShsb2FkZXItPmlzTG9hZGluZ01haW5GcmFtZSgpID8gUmVz b3VyY2VSZXF1ZXN0OjpUYXJnZXRJc01haW5GcmFtZSA6IFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0 SXNTdWJmcmFtZSk7CisgICAgICAgICAgICBpZiAobG9hZGVyLT5jYW5IYW5kbGVSZXF1ZXN0KHJl cXVlc3QpKSB7CiAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbShPcGVuTGlua0l0ZW0pOwogICAg ICAgICAgICAgICAgIGFwcGVuZEl0ZW0oT3BlbkxpbmtJbk5ld1dpbmRvd0l0ZW0pOwogICAgICAg ICAgICAgICAgIGFwcGVuZEl0ZW0oRG93bmxvYWRGaWxlSXRlbSk7CkBAIC00NzgsNyArNDgxLDkg QEAgdm9pZCBDb250ZXh0TWVudTo6cG9wdWxhdGUoKQogICAgICAgICBGcmFtZUxvYWRlciogbG9h ZGVyID0gZnJhbWUtPmxvYWRlcigpOwogICAgICAgICBLVVJMIGxpbmtVUkwgPSByZXN1bHQuYWJz b2x1dGVMaW5rVVJMKCk7CiAgICAgICAgIGlmICghbGlua1VSTC5pc0VtcHR5KCkpIHsKLSAgICAg ICAgICAgIGlmIChsb2FkZXItPmNhbkhhbmRsZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KGxpbmtV UkwpKSkgeworICAgICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QobGlua1VSTCk7Cisg ICAgICAgICAgICByZXF1ZXN0LnNldFRhcmdldFR5cGUobG9hZGVyLT5pc0xvYWRpbmdNYWluRnJh bWUoKSA/IFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNNYWluRnJhbWUgOiBSZXNvdXJjZVJlcXVl c3Q6OlRhcmdldElzU3ViZnJhbWUpOworICAgICAgICAgICAgaWYgKGxvYWRlci0+Y2FuSGFuZGxl UmVxdWVzdChyZXF1ZXN0KSkgewogICAgICAgICAgICAgICAgIGFwcGVuZEl0ZW0oT3BlbkxpbmtJ dGVtKTsKICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKE9wZW5MaW5rSW5OZXdXaW5kb3dJdGVt KTsKICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKERvd25sb2FkRmlsZUl0ZW0pOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS93bWwvV01MR29FbGVtZW50LmNwcCBiL1dlYkNvcmUvd21sL1dNTEdvRWxl bWVudC5jcHAKaW5kZXggY2M0MTIyNi4uNjBmYTM5NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS93bWwv V01MR29FbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL3dtbC9XTUxHb0VsZW1lbnQuY3BwCkBAIC0x LDUgKzEsNiBAQAogLyoqCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDkgVG9yY2ggTW9iaWxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gKGh0dHA6Ly93d3cudG9yY2htb2JpbGUuY29tLykK KyAqIENvcHlyaWdodCAoQykgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQgMjAxMC4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91 IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1z IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtMTI3LDYgKzEyOCw3IEBAIHZv aWQgV01MR29FbGVtZW50OjpleGVjdXRlVGFzaygpCiAKICAgICAvLyBQcmVwYXJlIGxvYWRpbmcg dGhlIGRlc3RpbmF0aW9uIHVybAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KHVybCk7Cisg ICAgcmVxdWVzdC5zZXRUYXJnZXRUeXBlKGxvYWRlci0+aXNMb2FkaW5nTWFpbkZyYW1lKCkgPyBS ZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzTWFpbkZyYW1lIDogUmVzb3VyY2VSZXF1ZXN0OjpUYXJn ZXRJc1N1YmZyYW1lKTsKIAogICAgIGlmIChnZXRBdHRyaWJ1dGUoc2VuZHJlZmVyZXJBdHRyKSA9 PSAidHJ1ZSIpCiAgICAgICAgIHJlcXVlc3Quc2V0SFRUUFJlZmVycmVyKGxvYWRlci0+b3V0Z29p bmdSZWZlcnJlcigpKTsKLS0gCjEuNy4zLjEKCg==