32167 2009-12-04 12:07:10 -0800 Extend ResourceRequest::TargetType to be more specific 2009-12-08 14:07:56 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mbelshe mbelshe abarth andersca ap beidson commit-queue darin eric fishd mjs webkit.review.bot oldest_to_newest 168867 0 mbelshe 2009-12-04 12:07:10 -0800 We'd like to pass more information about a ResourceRequest through to the network layer. The Chromium ResourceRequest::RequestType currently defines all subresources as "TargetIsSubResource". Expand this to specify CSS, Script, etc, so that the network layer can more accurately assign priority to these resources. 168928 1 44336 mbelshe 2009-12-04 14:31:17 -0800 Created attachment 44336 First patch. 168931 2 webkit.review.bot 2009-12-04 14:35:54 -0800 style-queue ran check-webkit-style on attachment 44336 without any errors. 168935 3 eric 2009-12-04 14:47:53 -0800 Entertainingly someone recently tried this in a different bug, but their excuse was to enable ad-blocking at the network layer. I think that this proposal has much more merit. I'll see if I can dig up the other bug. 168938 4 eric 2009-12-04 14:52:04 -0800 Bug 27787 was the bug I was thinking of. 168950 5 mbelshe 2009-12-04 15:14:37 -0800 Thanks for taking a look Eric - I hadn't seen that other (very similar!) bug. Fortunately, my patch does not have the layering violation which Adam pointed out. It keeps the two types separate (CachedResource::Type and ResourceRequest::Type). Although it is tempting to merge them, it doesn't seem like a good thing (due to layering). 168955 6 44336 fishd 2009-12-04 15:25:28 -0800 Comment on attachment 44336 First patch. > Index: WebCore/ChangeLog > + Bug 32167 - Update the ResourceRequest::RequestType. This previously > + was specific to Chromium. Moved into ResourceRequestBase, enabling > + more specificity about the type (which is otherwise only known to the > + loader), and also making this information available to all platforms. > + Any platform with a network layer which can utilize this information > + may want to use it for prioritization. nit: Bug XXX should be a https://bugs.webkit.org/ link so that it is clickable from trac.webkit.org. > Index: WebCore/loader/loader.cpp ... > +ResourceRequestBase::TargetType CachedResourceTypeToTargetType(CachedResource::Type type) nit: webkit style has functions starting with a lowercase letter. nit: i think it should be okay to refer to ResourceRequest::TargetType. we generally avoid referring to the *Base class since it is actually just an implementation detail (to allow for code sharing). > + return ResourceRequest::TargetIsStyleSheet; ^^^ here you just use ResourceRequest::, which is nice. > Index: WebCore/platform/network/ResourceRequestBase.h > + enum TargetType { > + TargetIsMainFrame, // Resource is a main frame. > + TargetIsSubFrame, // Resource is a sub frame. > + TargetIsSubResource, // Resource is a generic subresource. (Generally a specific type should be specified) > + TargetIsStyleSheet, // A stylesheet subresource. > + TargetIsScript, // A script subresource. > + TargetIsFontResource, // A font subresource. > + TargetIsImage, // An image subresource. > + TargetIsObject, // An object resource. > + TargetIsMedia // A media resource. > + }; nit: The comments seems a bit redundant. WebKit style is typically to avoid redundant comments. The parenthetical comment is helpful though. LGTM with these nits addressed. 168961 7 darin 2009-12-04 15:40:02 -0800 This additional information is something that won’t survive the round trip through NSURLRequest on Mac OS X. 169017 8 fishd 2009-12-04 19:44:56 -0800 > This additional information is something that won’t survive the round trip > through NSURLRequest on Mac OS X. Is that a big problem? Is there a WebKit API where that survival is important? webView:resource:willSendRequest:redirectResponse:fromDataSource:? 169123 9 darin 2009-12-06 14:08:14 -0800 (In reply to comment #8) > > This additional information is something that won’t survive the round trip > > through NSURLRequest on Mac OS X. > > Is that a big problem? Is there a WebKit API where that survival is important? > webView:resource:willSendRequest:redirectResponse:fromDataSource:? I don't know. 169125 10 abarth 2009-12-06 14:24:53 -0800 This restriction keeps coming up. Can we fix things so that WebCore types don't depend on implementation details of the Mac port? 169319 11 44415 mbelshe 2009-12-07 07:31:14 -0800 Created attachment 44415 Patch addressing Darin's comments. 169322 12 webkit.review.bot 2009-12-07 07:33:49 -0800 style-queue ran check-webkit-style on attachment 44415 without any errors. 169337 13 darin 2009-12-07 09:15:16 -0800 It would be nice if someone completely eliminated the issue of ResourceRequest fields that don't round trip in NSURLRequest with some architectural change to the Mac OS X version of WebKit. But even before that we just need to answer the simpler question: Does that fact cause any problems with this patch? My hope is that the answer is no, and this won't hold up landing the patch. But it would be good to know that someone has considered this and decided the answer is no. 169359 14 fishd 2009-12-07 10:29:21 -0800 > But even before that we just need to answer the simpler question: Does that > fact cause any problems with this patch? My hope is that the answer is no, and > this won't hold up landing the patch. But it would be good to know that someone > has considered this and decided the answer is no. I think the answer is no. The caller of willSendRequest can just copy fields from the original ResourceRequest to the resultant ResourceRequest that correspond to fields that cannot be expressed via NSURLReqeuest. That way the fields are not lost. Exposing the fields to the embedder would require API changes, but that's another matter. 169360 15 fishd 2009-12-07 10:30:14 -0800 One more thing: willSendRequest is the only round-trip case I could find. 169366 16 44415 fishd 2009-12-07 10:32:48 -0800 Comment on attachment 44415 Patch addressing Darin's comments. > Index: WebCore/platform/network/ResourceRequestBase.h ... > + enum TargetType { > + TargetIsMainFrame, > + TargetIsSubFrame, > + TargetIsSubResource, // Resource is a generic subresource. (Generally a specific type should be specified) Sorry to over nit, but just for completeness my suggestion was to only keep the comment in parenthesis since the "Resource is a generic subresource" is a bit redundant with TargetIsSubResource. So, just this: TargetIsSubResource, // Generally a specific type should be specified instead. R=me 169371 17 darin 2009-12-07 10:35:55 -0800 Oops, just noticed something. Normally "subframe" and "subresource" are treated as single words, not "sub-frame" and "sub-resource", hence capitalization should be "Subframe" and "Subresource" not "SubFrame" and "SubResource". See the spelling of the class name SubresourceLoader and the function name subframeIsLoading. I see a few cases where this is wrong, but all but a few are in this Chromium code. Lets stay consistent. 169374 18 ap 2009-12-07 10:38:56 -0800 It's not entirely obvious that preserving the field is the desired behavior though. A client can replace the request with an entirely different one. This is probably OK for TargetType, but auditing every future addition to ResourceRequest from this point of view can be difficult. 169469 19 44432 mbelshe 2009-12-07 14:05:25 -0800 Created attachment 44432 Rename SubResource to Subresource as per DarinAdler. 169470 20 webkit.review.bot 2009-12-07 14:08:07 -0800 style-queue ran check-webkit-style on attachment 44432 without any errors. 169482 21 44432 darin 2009-12-07 14:51:53 -0800 Comment on attachment 44432 Rename SubResource to Subresource as per DarinAdler. > + TargetIsSubFrame, As long as you are taking my renaming suggestion, what about SubFrame here? 169522 22 44444 mbelshe 2009-12-07 16:27:06 -0800 Created attachment 44444 Also rename SubFrame to Subframe 169523 23 webkit.review.bot 2009-12-07 16:27:24 -0800 style-queue ran check-webkit-style on attachment 44444 without any errors. 169538 24 44444 darin 2009-12-07 16:54:18 -0800 Comment on attachment 44444 Also rename SubFrame to Subframe > + No new tests. (OOPS!) Commit queue won't be able to land the patch with this in the ChangeLog. 169560 25 44444 commit-queue 2009-12-07 17:41:28 -0800 Comment on attachment 44444 Also rename SubFrame to Subframe Rejecting patch 44444 from commit-queue. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 Last 500 characters of output: re/loader/loader.cpp M WebCore/platform/network/ResourceRequestBase.h M WebCore/platform/network/chromium/ResourceRequest.h A repository hook failed: MERGE request failed on '/repository/webkit/trunk': Commit blocked by pre-commit hook (exit code 1) with output: svnlook: Can't write to stream: Broken pipe The following ChangeLog files contain OOPS: trunk/WebCore/ChangeLog Please don't ever say "OOPS" in a ChangeLog file. at /usr/local/git/libexec/git-core/git-svn line 558 169686 26 44474 mbelshe 2009-12-08 08:34:12 -0800 Created attachment 44474 oops the oops. 169687 27 44474 commit-queue 2009-12-08 08:34:20 -0800 Comment on attachment 44474 oops the oops. Rejecting patch 44474 from review queue. mike@belshe.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py. - If you have reviewer rights please correct the error in WebKitTools/Scripts/modules/committers.py by adding yourself to the file (no review needed) and then set the reviewer flag again. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. 169691 28 webkit.review.bot 2009-12-08 08:39:32 -0800 style-queue ran check-webkit-style on attachment 44474 without any errors. 169694 29 44474 abarth 2009-12-08 08:48:31 -0800 Comment on attachment 44474 oops the oops. Forwarding darin's r+ 169699 30 44474 commit-queue 2009-12-08 09:05:07 -0800 Comment on attachment 44474 oops the oops. Clearing flags on attachment: 44474 Committed r51859: <http://trac.webkit.org/changeset/51859> 169700 31 commit-queue 2009-12-08 09:05:16 -0800 All reviewed patches have been landed. Closing bug. 169704 32 beidson 2009-12-08 09:42:52 -0800 Note that this patch broke the build and required http://trac.webkit.org/changeset/51861 as a followup build fix. Is it expected that the commit bot can break the build? That's one human task we probably shouldn't have replaced by a script... 169706 33 abarth 2009-12-08 10:08:32 -0800 (In reply to comment #32) > Note that this patch broke the build and required > http://trac.webkit.org/changeset/51861 as a followup build fix. Sorry, this was entirely my fault. I clicked the button and got distracted. :( 169709 34 eric 2009-12-08 10:22:09 -0800 The commit-queue will never break Mac Leopard Release (that platform it's currently being run from), but can certainly break other platforms. In general this has not been a problem in the past. The commit queue has landed nearly 900 patches and this is the second break I've heard of (although there have likely been a few others). Still way less often than any human. :) Sorry for the trouble. 169712 35 beidson 2009-12-08 10:25:00 -0800 Humans build-breaking problem will never be fixed 100%. But at least when a human breaks the build, there's concrete blame and a specific individual whose responsibility it is to fix it. If there's an anonymous tool checking in and it has known shortcomings, shouldn't they be fixed...? 169714 36 abarth 2009-12-08 10:29:57 -0800 > Humans build-breaking problem will never be fixed 100%. But at least when a > human breaks the build, there's concrete blame and a specific individual whose > responsibility it is to fix it. There is a specific individual to blame: the one who set the commit-queue+ flag. In this case, that's me. We can surface that information move visibly (e.g., in the ChangeLog) if that would be helpful. Morally, there isn't really a difference between typing "svn ci" on the command line and marking commit-queue+ in bugzilla. 169715 37 beidson 2009-12-08 10:35:00 -0800 This is a serious question, I don't know the answer to it: By design, should the commit-bot be able to check something in that breaks the build? IMO, setting "commit-queue+" and typing "svn ci" can only be morally equivalent if the commit-bot is designed to be capable of breaking the build. 169719 38 abarth 2009-12-08 10:38:38 -0800 > This is a serious question, I don't know the answer to it: By design, should > the commit-bot be able to check something in that breaks the build? Yes. It's not possible to design a system that is guaranteed not to break the build on all platforms. For example, we don't even have the ability to build all the ports. The commit-queue is a filter to stop bad patches from hitting the tree (just like the tree is a filter to stop bad patches from hitting releases). It has false positives and false negatives like all filters. > IMO, setting "commit-queue+" and typing "svn ci" can only be morally equivalent > if the commit-bot is designed to be capable of breaking the build. The social contract for setting commit-queue+ has always been that it's morally equivalent to typing svn ci. I wrote that in my first email on the subject. If it's not on the web site, we can clarify that point. Apparently the idea of surfacing who marked commit-queue+ in the ChangeLog has been discussed before: https://bugs.webkit.org/show_bug.cgi?id=29274 If you have thoughts on the matter, that might be a good place to mention them. 169725 39 abarth 2009-12-08 10:45:27 -0800 > If it's not on the web site, we can clarify that point. This was missing from the commit queue FAQ, but I've added it. https://trac.webkit.org/wiki/CommitQueue 169726 40 mbelshe 2009-12-08 10:45:44 -0800 Sorry about the build pain. I thought I had done all of the procedures right for commit. 169731 41 darin 2009-12-08 11:05:38 -0800 (In reply to comment #38) > The social contract for setting commit-queue+ has always been that it's morally > equivalent to typing svn ci. I wrote that in my first email on the subject. > If it's not on the web site, we can clarify that point. I don’t understand this. It’s wrong for me to “svn ci” without first testing the build and tests on at least one platform. But I thought it was right for me to set commit-queue+ without doing that. Maybe this bug is not the right place to discuss it. 169758 42 abarth 2009-12-08 12:56:02 -0800 > I don’t understand this. It’s wrong for me to “svn ci” without first testing > the build and tests on at least one platform. But I thought it was right for me > to set commit-queue+ without doing that. The commit-queue does build and test on the Mac platform. I believe this patch broke a different platform. 169778 43 beidson 2009-12-08 13:52:46 -0800 (In reply to comment #42) > > I don’t understand this. It’s wrong for me to “svn ci” without first testing > > the build and tests on at least one platform. But I thought it was right for me > > to set commit-queue+ without doing that. > > The commit-queue does build and test on the Mac platform. I believe this patch > broke a different platform. It builds and tests on Leopard. It broke SnowLeopard. 169787 44 abarth 2009-12-08 14:07:56 -0800 > It builds and tests on Leopard. It broke SnowLeopard. We could probably upgrade the box to SnowLeopard, but that wouldn't solve the reverse problem. In any case, chasing all the platforms is a fools errand. The early warning system we're working on will help with platform coverage and is more scalable, but that's a webkit-dev thread for another day. The current false negative rate seems to be low enough that responsible actions by committers should be sufficient. The problem in this case is that I acted irresponsibly by not watching the tree. 44336 2009-12-04 14:31:17 -0800 2009-12-07 16:27:06 -0800 First patch. bug32167 text/plain 8481 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTcxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDktMTItMDQgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAz MjE2NyAtIFVwZGF0ZSB0aGUgUmVzb3VyY2VSZXF1ZXN0OjpSZXF1ZXN0VHlwZS4gIFRoaXMgcHJl dmlvdXNseQorICAgICAgICB3YXMgc3BlY2lmaWMgdG8gQ2hyb21pdW0uICBNb3ZlZCBpbnRvIFJl c291cmNlUmVxdWVzdEJhc2UsIGVuYWJsaW5nCisgICAgICAgIG1vcmUgc3BlY2lmaWNpdHkgYWJv dXQgdGhlIHR5cGUgKHdoaWNoIGlzIG90aGVyd2lzZSBvbmx5IGtub3duIHRvIHRoZQorICAgICAg ICBsb2FkZXIpLCBhbmQgYWxzbyBtYWtpbmcgdGhpcyBpbmZvcm1hdGlvbiBhdmFpbGFibGUgdG8g YWxsIHBsYXRmb3Jtcy4KKyAgICAgICAgQW55IHBsYXRmb3JtIHdpdGggYSBuZXR3b3JrIGxheWVy IHdoaWNoIGNhbiB1dGlsaXplIHRoaXMgaW5mb3JtYXRpb24KKyAgICAgICAgbWF5IHdhbnQgdG8g dXNlIGl0IGZvciBwcmlvcml0aXphdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BT ISkKKworICAgICAgICAqIGxvYWRlci9sb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TG9h ZGVyOjpMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VUeXBlVG9UYXJn ZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkxvYWRlcjo6SG9zdDo6c2VydmVQZW5kaW5nUmVx dWVzdHMpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5o OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6KToKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdEJhc2U6OnRhcmdldFR5cGUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6c2V0VGFyZ2V0VHlwZSk6CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3RCYXNlOjpSZXNvdXJjZVJlcXVlc3RCYXNlKToKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgorCiAyMDA5LTEyLTA0ICBB bGJlcnQgSi4gV29uZyAgPGFqd29uZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTm90IHJldmll d2VkOiBjaHJvbWl1bSBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL2xvYWRlci9sb2FkZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL2xvYWRlci5jcHAJKHJldmlzaW9uIDUxNzEx KQorKysgV2ViQ29yZS9sb2FkZXIvbG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyAr NjEsOSBAQCBMb2FkZXI6OkxvYWRlcigpCiAgICAgLCBtX2lzU3VzcGVuZGluZ1BlbmRpbmdSZXF1 ZXN0cyhmYWxzZSkKIHsKICAgICBtX25vbkhUVFBQcm90b2NvbEhvc3QgPSBIb3N0OjpjcmVhdGUo QXRvbWljU3RyaW5nKCksIG1heFJlcXVlc3RzSW5GbGlnaHRGb3JOb25IVFRQUHJvdG9jb2xzKTsK KyNpZiBSRVFVRVNUX01BTkFHRU1FTlRfRU5BQkxFRAogICAgIG1heFJlcXVlc3RzSW5GbGlnaHRQ ZXJIb3N0ID0gaW5pdGlhbGl6ZU1heGltdW1IVFRQQ29ubmVjdGlvbkNvdW50UGVySG9zdCgpOwor I2VuZGlmCiB9CiAKIExvYWRlcjo6fkxvYWRlcigpCkBAIC02OSw2ICs3MSwyNyBAQCBMb2FkZXI6 On5Mb2FkZXIoKQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogICAgIAorUmVzb3VyY2VS ZXF1ZXN0QmFzZTo6VGFyZ2V0VHlwZSBDYWNoZWRSZXNvdXJjZVR5cGVUb1RhcmdldFR5cGUoQ2Fj aGVkUmVzb3VyY2U6OlR5cGUgdHlwZSkKK3sKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNl IENhY2hlZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0OgorI2lmIEVOQUJMRShYU0xUKQorICAgIGNh c2UgQ2FjaGVkUmVzb3VyY2U6OlhTTFN0eWxlU2hlZXQ6CisjZW5kaWYKKyNpZiBFTkFCTEUoWEJM KQorICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlhCTDoKKyNlbmRpZgorICAgICAgICByZXR1cm4g UmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1N0eWxlU2hlZXQ7CisgICAgY2FzZSBDYWNoZWRSZXNv dXJjZTo6U2NyaXB0OiAKKyAgICAgICAgcmV0dXJuIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNT Y3JpcHQ7CisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6Rm9udFJlc291cmNlOgorICAgICAgICBy ZXR1cm4gUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ZvbnRSZXNvdXJjZTsKKyAgICBjYXNlIENh Y2hlZFJlc291cmNlOjpJbWFnZVJlc291cmNlOgorICAgICAgICByZXR1cm4gUmVzb3VyY2VSZXF1 ZXN0OjpUYXJnZXRJc0ltYWdlOworICAgIH0KKyAgICByZXR1cm4gUmVzb3VyY2VSZXF1ZXN0OjpU YXJnZXRJc1N1YlJlc291cmNlOworfQorCiBMb2FkZXI6OlByaW9yaXR5IExvYWRlcjo6ZGV0ZXJt aW5lUHJpb3JpdHkoY29uc3QgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKSBjb25zdAogewogI2lm IFJFUVVFU1RfTUFOQUdFTUVOVF9FTkFCTEVECkBAIC0yOTksNiArMzIyLDcgQEAgdm9pZCBMb2Fk ZXI6Okhvc3Q6OnNlcnZlUGVuZGluZ1JlcXVlc3RzKAogICAgICAgICByZXF1ZXN0c1BlbmRpbmcu cmVtb3ZlRmlyc3QoKTsKICAgICAgICAgCiAgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJj ZVJlcXVlc3QocmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKS0+dXJsKCkpOworICAgICAgICByZXNv dXJjZVJlcXVlc3Quc2V0VGFyZ2V0VHlwZShDYWNoZWRSZXNvdXJjZVR5cGVUb1RhcmdldFR5cGUo cmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKS0+dHlwZSgpKSk7CiAgICAgICAgIAogICAgICAgICBp ZiAoIXJlcXVlc3QtPmNhY2hlZFJlc291cmNlKCktPmFjY2VwdCgpLmlzRW1wdHkoKSkKICAgICAg ICAgICAgIHJlc291cmNlUmVxdWVzdC5zZXRIVFRQQWNjZXB0KHJlcXVlc3QtPmNhY2hlZFJlc291 cmNlKCktPmFjY2VwdCgpKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJj ZVJlcXVlc3RCYXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlUmVxdWVzdEJhc2UuaAkocmV2aXNpb24gNTE3MTEpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1 MiwxOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgLy8gRG8gbm90IHVzZSB0aGlzIHR5cGUg ZGlyZWN0bHkuICBVc2UgUmVzb3VyY2VSZXF1ZXN0IGluc3RlYWQuCiAgICAgY2xhc3MgUmVzb3Vy Y2VSZXF1ZXN0QmFzZSB7CiAgICAgcHVibGljOgorICAgICAgICAvLyBUaGUgdHlwZSBvZiB0aGlz IFJlc291cmNlUmVxdWVzdCwgYmFzZWQgb24gaG93IHRoZSByZXNvdXJjZSB3aWxsIGJlIHVzZWQu CisgICAgICAgIGVudW0gVGFyZ2V0VHlwZSB7CisgICAgICAgICAgICBUYXJnZXRJc01haW5GcmFt ZSwgICAgIC8vIFJlc291cmNlIGlzIGEgbWFpbiBmcmFtZS4KKyAgICAgICAgICAgIFRhcmdldElz U3ViRnJhbWUsICAgICAgLy8gUmVzb3VyY2UgaXMgYSBzdWIgZnJhbWUuCisgICAgICAgICAgICBU YXJnZXRJc1N1YlJlc291cmNlLCAgIC8vIFJlc291cmNlIGlzIGEgZ2VuZXJpYyBzdWJyZXNvdXJj ZS4gIChHZW5lcmFsbHkgYSBzcGVjaWZpYyB0eXBlIHNob3VsZCBiZSBzcGVjaWZpZWQpCisgICAg ICAgICAgICBUYXJnZXRJc1N0eWxlU2hlZXQsICAgIC8vIEEgc3R5bGVzaGVldCBzdWJyZXNvdXJj ZS4KKyAgICAgICAgICAgIFRhcmdldElzU2NyaXB0LCAgICAgICAgLy8gQSBzY3JpcHQgc3VicmVz b3VyY2UuCisgICAgICAgICAgICBUYXJnZXRJc0ZvbnRSZXNvdXJjZSwgIC8vIEEgZm9udCBzdWJy ZXNvdXJjZS4KKyAgICAgICAgICAgIFRhcmdldElzSW1hZ2UsICAgICAgICAgLy8gQW4gaW1hZ2Ug c3VicmVzb3VyY2UuCisgICAgICAgICAgICBUYXJnZXRJc09iamVjdCwgICAgICAgIC8vIEFuIG9i amVjdCByZXNvdXJjZS4KKyAgICAgICAgICAgIFRhcmdldElzTWVkaWEgICAgICAgICAgLy8gQSBt ZWRpYSByZXNvdXJjZS4KKyAgICAgICAgfTsKKwogICAgICAgICBzdGF0aWMgc3RkOjphdXRvX3B0 cjxSZXNvdXJjZVJlcXVlc3Q+IGFkb3B0KHN0ZDo6YXV0b19wdHI8Q3Jvc3NUaHJlYWRSZXNvdXJj ZVJlcXVlc3REYXRhPik7CiAKICAgICAgICAgLy8gR2V0cyBhIGNvcHkgb2YgdGhlIGRhdGEgc3Vp dGFibGUgZm9yIHBhc3NpbmcgdG8gYW5vdGhlciB0aHJlYWQuCkBAIC0xMTcsMTIgKzEzMCwxNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgcmVwb3J0VXBsb2FkUHJvZ3Jlc3Mo KSBjb25zdCB7IHJldHVybiBtX3JlcG9ydFVwbG9hZFByb2dyZXNzOyB9CiAgICAgICAgIHZvaWQg c2V0UmVwb3J0VXBsb2FkUHJvZ3Jlc3MoYm9vbCByZXBvcnRVcGxvYWRQcm9ncmVzcykgeyBtX3Jl cG9ydFVwbG9hZFByb2dyZXNzID0gcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7IH0KIAorICAgICAgICAv LyBXaGF0IHRoaXMgcmVxdWVzdCBpcyBmb3IuCisgICAgICAgIFRhcmdldFR5cGUgdGFyZ2V0VHlw ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQorICAgICAgICB2b2lkIHNldFRhcmdl dFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KKwogICAgIHBy b3RlY3RlZDoKICAgICAgICAgLy8gVXNlZCB3aGVuIFJlc291cmNlUmVxdWVzdCBpcyBpbml0aWFs aXplZCBmcm9tIGEgcGxhdGZvcm0gcmVwcmVzZW50YXRpb24gb2YgdGhlIHJlcXVlc3QKICAgICAg ICAgUmVzb3VyY2VSZXF1ZXN0QmFzZSgpCiAgICAgICAgICAgICA6IG1fcmVzb3VyY2VSZXF1ZXN0 VXBkYXRlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVkKHRy dWUpCiAgICAgICAgICAgICAsIG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3MoZmFsc2UpCisgICAgICAg ICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAg ICAgIH0KIApAQCAtMTM1LDYgKzE1Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg ICAgICwgbV9yZXNvdXJjZVJlcXVlc3RVcGRhdGVkKHRydWUpCiAgICAgICAgICAgICAsIG1fcGxh dGZvcm1SZXF1ZXN0VXBkYXRlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9yZXBvcnRVcGxvYWRQ cm9ncmVzcyhmYWxzZSkKKyAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVz b3VyY2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC0xNTQsNiArMTczLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICBtdXRhYmxlIGJvb2wgbV9yZXNvdXJjZVJlcXVlc3RVcGRh dGVkOwogICAgICAgICBtdXRhYmxlIGJvb2wgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVkOwogICAg ICAgICBib29sIG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7CisgICAgICAgIFRhcmdldFR5cGUgbV90 YXJnZXRUeXBlOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiBhc1Jlc291cmNlUmVxdWVzdCgpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNTE3MTEp CisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTM3LDIwICszNywxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1ZXN0QmFzZSB7 CiAgICAgcHVibGljOgotICAgICAgICBlbnVtIFRhcmdldFR5cGUgewotICAgICAgICAgICAgVGFy Z2V0SXNNYWluRnJhbWUsCi0gICAgICAgICAgICBUYXJnZXRJc1N1YkZyYW1lLAotICAgICAgICAg ICAgVGFyZ2V0SXNTdWJSZXNvdXJjZSwKLSAgICAgICAgICAgIFRhcmdldElzT2JqZWN0LAotICAg ICAgICAgICAgVGFyZ2V0SXNNZWRpYQotICAgICAgICB9OwotCiAgICAgICAgIFJlc291cmNlUmVx dWVzdChjb25zdCBTdHJpbmcmIHVybCkgCiAgICAgICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJh c2UoS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAg ICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQ cm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAg ICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAg ICB9CiAKQEAgLTU5LDcgKzUwLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAg LCBtX3JlcXVlc3RvcklEKDApCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDAp CiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKLSAgICAgICAgICAgICwgbV90YXJn ZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgICAgICAsIG1fc2VjdXJpdHlJbmZv KHNlY3VyaXR5SW5mbykKICAgICAgICAgewogICAgICAgICB9CkBAIC02OSw3ICs1OSw2IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAg ICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENhY2hl SG9zdElEKDApCi0gICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNl KQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtNzgsNyArNjcsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9y ZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQot ICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAg ewogICAgICAgICAgICAgc2V0SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpAQCAt ODgsNyArNzYsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVz dG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAgICAg ICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFy Z2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTk2LDEwICs4Myw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IHJlcXVlc3RvcklEKCkgY29uc3Qg eyByZXR1cm4gbV9yZXF1ZXN0b3JJRDsgfQogICAgICAgICB2b2lkIHNldFJlcXVlc3RvcklEKGlu dCByZXF1ZXN0b3JJRCkgeyBtX3JlcXVlc3RvcklEID0gcmVxdWVzdG9ySUQ7IH0KIAotICAgICAg ICAvLyBXaGF0IHRoaXMgcmVxdWVzdCBpcyBmb3IuCi0gICAgICAgIFRhcmdldFR5cGUgdGFyZ2V0 VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQotICAgICAgICB2b2lkIHNldFRh cmdldFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KLQogICAg ICAgICAvLyBUaGUgcHJvY2VzcyBpZCBvZiB0aGUgcHJvY2VzcyBmcm9tIHdoaWNoIHRoaXMgcmVx dWVzdCBvcmlnaW5hdGVkLiBJbgogICAgICAgICAvLyB0aGUgY2FzZSBvZiBvdXQtb2YtcHJvY2Vz cyBwbHVnaW5zLCB0aGlzIGFsbG93cyB0byBsaW5rIGJhY2sgdGhlCiAgICAgICAgIC8vIHJlcXVl c3QgdG8gdGhlIHBsdWdpbiBwcm9jZXNzIChhcyBpdCBpcyBwcm9jZXNzZWQgdGhyb3VnaCBhIHJl bmRlcgpAQCAtMTI5LDcgKzExMiw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50 IG1fcmVxdWVzdG9ySUQ7CiAgICAgICAgIGludCBtX3JlcXVlc3RvclByb2Nlc3NJRDsKICAgICAg ICAgaW50IG1fYXBwQ2FjaGVIb3N0SUQ7Ci0gICAgICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBl OwogICAgICAgICBDU3RyaW5nIG1fc2VjdXJpdHlJbmZvOwogICAgIH07CiAK 44415 2009-12-07 07:31:14 -0800 2009-12-07 16:27:06 -0800 Patch addressing Darin's comments. bug32167.patch text/plain 8272 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTcxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMTItMDQgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE1MgorICAgICAgICBVcGRhdGUg dGhlIFJlc291cmNlUmVxdWVzdDo6UmVxdWVzdFR5cGUuICBUaGlzIHByZXZpb3VzbHkKKyAgICAg ICAgd2FzIHNwZWNpZmljIHRvIENocm9taXVtLiAgTW92ZWQgaW50byBSZXNvdXJjZVJlcXVlc3RC YXNlLCBlbmFibGluZworICAgICAgICBtb3JlIHNwZWNpZmljaXR5IGFib3V0IHRoZSB0eXBlICh3 aGljaCBpcyBvdGhlcndpc2Ugb25seSBrbm93biB0byB0aGUKKyAgICAgICAgbG9hZGVyKSwgYW5k IGFsc28gbWFraW5nIHRoaXMgaW5mb3JtYXRpb24gYXZhaWxhYmxlIHRvIGFsbCBwbGF0Zm9ybXMu CisgICAgICAgIEFueSBwbGF0Zm9ybSB3aXRoIGEgbmV0d29yayBsYXllciB3aGljaCBjYW4gdXRp bGl6ZSB0aGlzIGluZm9ybWF0aW9uCisgICAgICAgIG1heSB3YW50IHRvIHVzZSBpdCBmb3IgcHJp b3JpdGl6YXRpb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAg KiBsb2FkZXIvbG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxvYWRlcjo6TG9hZGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlVHlwZVRvVGFyZ2V0VHlwZSk6CisgICAg ICAgIChXZWJDb3JlOjpMb2FkZXI6Okhvc3Q6OnNlcnZlUGVuZGluZ1JlcXVlc3RzKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdEJhc2U6Oik6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3RCYXNlOjp0YXJnZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdEJhc2U6OnNldFRhcmdldFR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0QmFzZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdDo6UmVzb3VyY2VSZXF1ZXN0KToKKwogMjAwOS0xMi0wNCAgQWxiZXJ0IEouIFdvbmcg IDxhandvbmdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZDogY2hyb21pdW0g YnVpbGQgZml4LgpJbmRleDogV2ViQ29yZS9sb2FkZXIvbG9hZGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2xvYWRlci9sb2FkZXIuY3BwCShyZXZpc2lvbiA1MTcxMSkKKysrIFdlYkNvcmUv bG9hZGVyL2xvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYxLDcgKzYxLDkgQEAgTG9hZGVy OjpMb2FkZXIoKQogICAgICwgbV9pc1N1c3BlbmRpbmdQZW5kaW5nUmVxdWVzdHMoZmFsc2UpCiB7 CiAgICAgbV9ub25IVFRQUHJvdG9jb2xIb3N0ID0gSG9zdDo6Y3JlYXRlKEF0b21pY1N0cmluZygp LCBtYXhSZXF1ZXN0c0luRmxpZ2h0Rm9yTm9uSFRUUFByb3RvY29scyk7CisjaWYgUkVRVUVTVF9N QU5BR0VNRU5UX0VOQUJMRUQKICAgICBtYXhSZXF1ZXN0c0luRmxpZ2h0UGVySG9zdCA9IGluaXRp YWxpemVNYXhpbXVtSFRUUENvbm5lY3Rpb25Db3VudFBlckhvc3QoKTsKKyNlbmRpZgogfQogCiBM b2FkZXI6On5Mb2FkZXIoKQpAQCAtNjksNiArNzEsMjcgQEAgTG9hZGVyOjp+TG9hZGVyKCkKICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KICAgICAKK1Jlc291cmNlUmVxdWVzdDo6VGFyZ2V0 VHlwZSBjYWNoZWRSZXNvdXJjZVR5cGVUb1RhcmdldFR5cGUoQ2FjaGVkUmVzb3VyY2U6OlR5cGUg dHlwZSkKK3sKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpD U1NTdHlsZVNoZWV0OgorI2lmIEVOQUJMRShYU0xUKQorICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6 OlhTTFN0eWxlU2hlZXQ6CisjZW5kaWYKKyNpZiBFTkFCTEUoWEJMKQorICAgIGNhc2UgQ2FjaGVk UmVzb3VyY2U6OlhCTDoKKyNlbmRpZgorICAgICAgICByZXR1cm4gUmVzb3VyY2VSZXF1ZXN0OjpU YXJnZXRJc1N0eWxlU2hlZXQ7CisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6U2NyaXB0OiAKKyAg ICAgICAgcmV0dXJuIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNTY3JpcHQ7CisgICAgY2FzZSBD YWNoZWRSZXNvdXJjZTo6Rm9udFJlc291cmNlOgorICAgICAgICByZXR1cm4gUmVzb3VyY2VSZXF1 ZXN0OjpUYXJnZXRJc0ZvbnRSZXNvdXJjZTsKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpJbWFn ZVJlc291cmNlOgorICAgICAgICByZXR1cm4gUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ltYWdl OworICAgIH0KKyAgICByZXR1cm4gUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1N1YlJlc291cmNl OworfQorCiBMb2FkZXI6OlByaW9yaXR5IExvYWRlcjo6ZGV0ZXJtaW5lUHJpb3JpdHkoY29uc3Qg Q2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKSBjb25zdAogewogI2lmIFJFUVVFU1RfTUFOQUdFTUVO VF9FTkFCTEVECkBAIC0yOTksNiArMzIyLDcgQEAgdm9pZCBMb2FkZXI6Okhvc3Q6OnNlcnZlUGVu ZGluZ1JlcXVlc3RzKAogICAgICAgICByZXF1ZXN0c1BlbmRpbmcucmVtb3ZlRmlyc3QoKTsKICAg ICAgICAgCiAgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVlc3QocmVxdWVzdC0+ Y2FjaGVkUmVzb3VyY2UoKS0+dXJsKCkpOworICAgICAgICByZXNvdXJjZVJlcXVlc3Quc2V0VGFy Z2V0VHlwZShjYWNoZWRSZXNvdXJjZVR5cGVUb1RhcmdldFR5cGUocmVxdWVzdC0+Y2FjaGVkUmVz b3VyY2UoKS0+dHlwZSgpKSk7CiAgICAgICAgIAogICAgICAgICBpZiAoIXJlcXVlc3QtPmNhY2hl ZFJlc291cmNlKCktPmFjY2VwdCgpLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHJlc291cmNlUmVx dWVzdC5zZXRIVFRQQWNjZXB0KHJlcXVlc3QtPmNhY2hlZFJlc291cmNlKCktPmFjY2VwdCgpKTsK SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2Uu aAkocmV2aXNpb24gNTE3MTEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VS ZXF1ZXN0QmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1MiwxOSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgLy8gRG8gbm90IHVzZSB0aGlzIHR5cGUgZGlyZWN0bHkuICBVc2UgUmVz b3VyY2VSZXF1ZXN0IGluc3RlYWQuCiAgICAgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0QmFzZSB7CiAg ICAgcHVibGljOgorICAgICAgICAvLyBUaGUgdHlwZSBvZiB0aGlzIFJlc291cmNlUmVxdWVzdCwg YmFzZWQgb24gaG93IHRoZSByZXNvdXJjZSB3aWxsIGJlIHVzZWQuCisgICAgICAgIGVudW0gVGFy Z2V0VHlwZSB7CisgICAgICAgICAgICBUYXJnZXRJc01haW5GcmFtZSwKKyAgICAgICAgICAgIFRh cmdldElzU3ViRnJhbWUsCisgICAgICAgICAgICBUYXJnZXRJc1N1YlJlc291cmNlLCAgLy8gUmVz b3VyY2UgaXMgYSBnZW5lcmljIHN1YnJlc291cmNlLiAgKEdlbmVyYWxseSBhIHNwZWNpZmljIHR5 cGUgc2hvdWxkIGJlIHNwZWNpZmllZCkKKyAgICAgICAgICAgIFRhcmdldElzU3R5bGVTaGVldCwK KyAgICAgICAgICAgIFRhcmdldElzU2NyaXB0LAorICAgICAgICAgICAgVGFyZ2V0SXNGb250UmVz b3VyY2UsCisgICAgICAgICAgICBUYXJnZXRJc0ltYWdlLAorICAgICAgICAgICAgVGFyZ2V0SXNP YmplY3QsCisgICAgICAgICAgICBUYXJnZXRJc01lZGlhCisgICAgICAgIH07CisKICAgICAgICAg c3RhdGljIHN0ZDo6YXV0b19wdHI8UmVzb3VyY2VSZXF1ZXN0PiBhZG9wdChzdGQ6OmF1dG9fcHRy PENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0YT4pOwogCiAgICAgICAgIC8vIEdldHMgYSBj b3B5IG9mIHRoZSBkYXRhIHN1aXRhYmxlIGZvciBwYXNzaW5nIHRvIGFub3RoZXIgdGhyZWFkLgpA QCAtMTE3LDEyICsxMzAsMTcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIHJl cG9ydFVwbG9hZFByb2dyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9yZXBvcnRVcGxvYWRQcm9ncmVz czsgfQogICAgICAgICB2b2lkIHNldFJlcG9ydFVwbG9hZFByb2dyZXNzKGJvb2wgcmVwb3J0VXBs b2FkUHJvZ3Jlc3MpIHsgbV9yZXBvcnRVcGxvYWRQcm9ncmVzcyA9IHJlcG9ydFVwbG9hZFByb2dy ZXNzOyB9CiAKKyAgICAgICAgLy8gV2hhdCB0aGlzIHJlcXVlc3QgaXMgZm9yLgorICAgICAgICBU YXJnZXRUeXBlIHRhcmdldFR5cGUoKSBjb25zdCB7IHJldHVybiBtX3RhcmdldFR5cGU7IH0KKyAg ICAgICAgdm9pZCBzZXRUYXJnZXRUeXBlKFRhcmdldFR5cGUgdHlwZSkgeyBtX3RhcmdldFR5cGUg PSB0eXBlOyB9CisKICAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIC8vIFVzZWQgd2hlbiBSZXNvdXJj ZVJlcXVlc3QgaXMgaW5pdGlhbGl6ZWQgZnJvbSBhIHBsYXRmb3JtIHJlcHJlc2VudGF0aW9uIG9m IHRoZSByZXF1ZXN0CiAgICAgICAgIFJlc291cmNlUmVxdWVzdEJhc2UoKQogICAgICAgICAgICAg OiBtX3Jlc291cmNlUmVxdWVzdFVwZGF0ZWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fcGxhdGZv cm1SZXF1ZXN0VXBkYXRlZCh0cnVlKQogICAgICAgICAgICAgLCBtX3JlcG9ydFVwbG9hZFByb2dy ZXNzKGZhbHNlKQorICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJj ZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTEzNSw2ICsxNTMsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVzb3VyY2VSZXF1ZXN0VXBkYXRlZCh0cnVlKQog ICAgICAgICAgICAgLCBtX3BsYXRmb3JtUmVxdWVzdFVwZGF0ZWQoZmFsc2UpCiAgICAgICAgICAg ICAsIG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3MoZmFsc2UpCisgICAgICAgICAgICAsIG1fdGFyZ2V0 VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtMTU0 LDYgKzE3Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgbXV0YWJsZSBib29sIG1f cmVzb3VyY2VSZXF1ZXN0VXBkYXRlZDsKICAgICAgICAgbXV0YWJsZSBib29sIG1fcGxhdGZvcm1S ZXF1ZXN0VXBkYXRlZDsKICAgICAgICAgYm9vbCBtX3JlcG9ydFVwbG9hZFByb2dyZXNzOworICAg ICAgICBUYXJnZXRUeXBlIG1fdGFyZ2V0VHlwZTsKIAogICAgIHByaXZhdGU6CiAgICAgICAgIGNv bnN0IFJlc291cmNlUmVxdWVzdCYgYXNSZXNvdXJjZVJlcXVlc3QoKSBjb25zdDsKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0 LmgJKHJldmlzaW9uIDUxNzExKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVt L1Jlc291cmNlUmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNywyMCArMzcsMTEgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0IDogcHVibGljIFJl c291cmNlUmVxdWVzdEJhc2UgewogICAgIHB1YmxpYzoKLSAgICAgICAgZW51bSBUYXJnZXRUeXBl IHsKLSAgICAgICAgICAgIFRhcmdldElzTWFpbkZyYW1lLAotICAgICAgICAgICAgVGFyZ2V0SXNT dWJGcmFtZSwKLSAgICAgICAgICAgIFRhcmdldElzU3ViUmVzb3VyY2UsCi0gICAgICAgICAgICBU YXJnZXRJc09iamVjdCwKLSAgICAgICAgICAgIFRhcmdldElzTWVkaWEKLSAgICAgICAgfTsKLQog ICAgICAgICBSZXNvdXJjZVJlcXVlc3QoY29uc3QgU3RyaW5nJiB1cmwpIAogICAgICAgICAgICAg OiBSZXNvdXJjZVJlcXVlc3RCYXNlKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpLCBVc2VQcm90 b2NvbENhY2hlUG9saWN5KQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDApCiAgICAgICAg ICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVI b3N0SUQoMCkKLSAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2Up CiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC01OSw3ICs1MCw2IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBtX3Jl cXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENhY2hlSG9zdElEKDApCi0g ICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICAg ICAgLCBtX3NlY3VyaXR5SW5mbyhzZWN1cml0eUluZm8pCiAgICAgICAgIHsKICAgICAgICAgfQpA QCAtNjksNyArNTksNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVx dWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAg ICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUo VGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTc4LDcgKzY3 LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDAp CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1f YXBwQ2FjaGVIb3N0SUQoMCkKLSAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3Vi UmVzb3VyY2UpCiAgICAgICAgIHsKICAgICAgICAgICAgIHNldEhUVFBSZWZlcnJlcihyZWZlcnJl cik7CiAgICAgICAgIH0KQEAgLTg4LDcgKzc2LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDApCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJv Y2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKLSAgICAgICAgICAg ICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgIHsKICAgICAgICAg fQogCkBAIC05NiwxMCArODMsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGludCBy ZXF1ZXN0b3JJRCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdG9ySUQ7IH0KICAgICAgICAgdm9p ZCBzZXRSZXF1ZXN0b3JJRChpbnQgcmVxdWVzdG9ySUQpIHsgbV9yZXF1ZXN0b3JJRCA9IHJlcXVl c3RvcklEOyB9CiAKLSAgICAgICAgLy8gV2hhdCB0aGlzIHJlcXVlc3QgaXMgZm9yLgotICAgICAg ICBUYXJnZXRUeXBlIHRhcmdldFR5cGUoKSBjb25zdCB7IHJldHVybiBtX3RhcmdldFR5cGU7IH0K LSAgICAgICAgdm9pZCBzZXRUYXJnZXRUeXBlKFRhcmdldFR5cGUgdHlwZSkgeyBtX3RhcmdldFR5 cGUgPSB0eXBlOyB9Ci0KICAgICAgICAgLy8gVGhlIHByb2Nlc3MgaWQgb2YgdGhlIHByb2Nlc3Mg ZnJvbSB3aGljaCB0aGlzIHJlcXVlc3Qgb3JpZ2luYXRlZC4gSW4KICAgICAgICAgLy8gdGhlIGNh c2Ugb2Ygb3V0LW9mLXByb2Nlc3MgcGx1Z2lucywgdGhpcyBhbGxvd3MgdG8gbGluayBiYWNrIHRo ZQogICAgICAgICAvLyByZXF1ZXN0IHRvIHRoZSBwbHVnaW4gcHJvY2VzcyAoYXMgaXQgaXMgcHJv Y2Vzc2VkIHRocm91Z2ggYSByZW5kZXIKQEAgLTEyOSw3ICsxMTIsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIGludCBtX3JlcXVlc3RvcklEOwogICAgICAgICBpbnQgbV9yZXF1ZXN0 b3JQcm9jZXNzSUQ7CiAgICAgICAgIGludCBtX2FwcENhY2hlSG9zdElEOwotICAgICAgICBUYXJn ZXRUeXBlIG1fdGFyZ2V0VHlwZTsKICAgICAgICAgQ1N0cmluZyBtX3NlY3VyaXR5SW5mbzsKICAg ICB9OwogCg== 44432 2009-12-07 14:05:25 -0800 2009-12-07 16:27:06 -0800 Rename SubResource to Subresource as per DarinAdler. bug32167.patch text/plain 8358 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTcxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDktMTItMDQgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE1MgorICAgICAgICBVcGRhdGUg dGhlIFJlc291cmNlUmVxdWVzdDo6UmVxdWVzdFR5cGUuICBUaGlzIHByZXZpb3VzbHkKKyAgICAg ICAgd2FzIHNwZWNpZmljIHRvIENocm9taXVtLiAgTW92ZWQgaW50byBSZXNvdXJjZVJlcXVlc3RC YXNlLCBlbmFibGluZworICAgICAgICBtb3JlIHNwZWNpZmljaXR5IGFib3V0IHRoZSB0eXBlICh3 aGljaCBpcyBvdGhlcndpc2Ugb25seSBrbm93biB0byB0aGUKKyAgICAgICAgbG9hZGVyKSwgYW5k IGFsc28gbWFraW5nIHRoaXMgaW5mb3JtYXRpb24gYXZhaWxhYmxlIHRvIGFsbCBwbGF0Zm9ybXMu CisgICAgICAgIEFueSBwbGF0Zm9ybSB3aXRoIGEgbmV0d29yayBsYXllciB3aGljaCBjYW4gdXRp bGl6ZSB0aGlzIGluZm9ybWF0aW9uCisgICAgICAgIG1heSB3YW50IHRvIHVzZSBpdCBmb3IgcHJp b3JpdGl6YXRpb24uCisKKyAgICAgICAgTm90ZSB0byBDaHJvbWl1bSBnbHVlOiBUYXJnZXRJc1N1 YlJlc291cmNlIHJlbmFtZWQgdG8gVGFyZ2V0SXNTdWJyZXNvdXJjZS4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIGxvYWRlci9sb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TG9hZGVyOjpMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVz b3VyY2VUeXBlVG9UYXJnZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkxvYWRlcjo6SG9zdDo6 c2VydmVQZW5kaW5nUmVxdWVzdHMpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VSZXF1ZXN0QmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJhc2U6OnRhcmdldFR5cGUpOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6c2V0VGFyZ2V0VHlwZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3RCYXNlOjpSZXNvdXJjZVJlcXVlc3RCYXNl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5o OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgor CiAyMDA5LTEyLTA0ICBBbGJlcnQgSi4gV29uZyAgPGFqd29uZ0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgTm90IHJldmlld2VkOiBjaHJvbWl1bSBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL2xv YWRlci9sb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL2xvYWRlci5jcHAJ KHJldmlzaW9uIDUxNzExKQorKysgV2ViQ29yZS9sb2FkZXIvbG9hZGVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjEsNyArNjEsOSBAQCBMb2FkZXI6OkxvYWRlcigpCiAgICAgLCBtX2lzU3VzcGVu ZGluZ1BlbmRpbmdSZXF1ZXN0cyhmYWxzZSkKIHsKICAgICBtX25vbkhUVFBQcm90b2NvbEhvc3Qg PSBIb3N0OjpjcmVhdGUoQXRvbWljU3RyaW5nKCksIG1heFJlcXVlc3RzSW5GbGlnaHRGb3JOb25I VFRQUHJvdG9jb2xzKTsKKyNpZiBSRVFVRVNUX01BTkFHRU1FTlRfRU5BQkxFRAogICAgIG1heFJl cXVlc3RzSW5GbGlnaHRQZXJIb3N0ID0gaW5pdGlhbGl6ZU1heGltdW1IVFRQQ29ubmVjdGlvbkNv dW50UGVySG9zdCgpOworI2VuZGlmCiB9CiAKIExvYWRlcjo6fkxvYWRlcigpCkBAIC02OSw2ICs3 MSwyNyBAQCBMb2FkZXI6On5Mb2FkZXIoKQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQog ICAgIAorUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRUeXBlIGNhY2hlZFJlc291cmNlVHlwZVRvVGFy Z2V0VHlwZShDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlKQoreworICAgIHN3aXRjaCAodHlwZSkg eworICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkNTU1N0eWxlU2hlZXQ6CisjaWYgRU5BQkxFKFhT TFQpCisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6WFNMU3R5bGVTaGVldDoKKyNlbmRpZgorI2lm IEVOQUJMRShYQkwpCisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6WEJMOgorI2VuZGlmCisgICAg ICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzU3R5bGVTaGVldDsKKyAgICBjYXNl IENhY2hlZFJlc291cmNlOjpTY3JpcHQ6IAorICAgICAgICByZXR1cm4gUmVzb3VyY2VSZXF1ZXN0 OjpUYXJnZXRJc1NjcmlwdDsKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpGb250UmVzb3VyY2U6 CisgICAgICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzRm9udFJlc291cmNlOwor ICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2U6CisgICAgICAgIHJldHVybiBS ZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2U7CisgICAgfQorICAgIHJldHVybiBSZXNvdXJj ZVJlcXVlc3Q6OlRhcmdldElzU3VicmVzb3VyY2U7Cit9CisKIExvYWRlcjo6UHJpb3JpdHkgTG9h ZGVyOjpkZXRlcm1pbmVQcmlvcml0eShjb25zdCBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UpIGNv bnN0CiB7CiAjaWYgUkVRVUVTVF9NQU5BR0VNRU5UX0VOQUJMRUQKQEAgLTI5OSw2ICszMjIsNyBA QCB2b2lkIExvYWRlcjo6SG9zdDo6c2VydmVQZW5kaW5nUmVxdWVzdHMoCiAgICAgICAgIHJlcXVl c3RzUGVuZGluZy5yZW1vdmVGaXJzdCgpOwogICAgICAgICAKICAgICAgICAgUmVzb3VyY2VSZXF1 ZXN0IHJlc291cmNlUmVxdWVzdChyZXF1ZXN0LT5jYWNoZWRSZXNvdXJjZSgpLT51cmwoKSk7Cisg ICAgICAgIHJlc291cmNlUmVxdWVzdC5zZXRUYXJnZXRUeXBlKGNhY2hlZFJlc291cmNlVHlwZVRv VGFyZ2V0VHlwZShyZXF1ZXN0LT5jYWNoZWRSZXNvdXJjZSgpLT50eXBlKCkpKTsKICAgICAgICAg CiAgICAgICAgIGlmICghcmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKS0+YWNjZXB0KCkuaXNFbXB0 eSgpKQogICAgICAgICAgICAgcmVzb3VyY2VSZXF1ZXN0LnNldEhUVFBBY2NlcHQocmVxdWVzdC0+ Y2FjaGVkUmVzb3VyY2UoKS0+YWNjZXB0KCkpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCShyZXZpc2lvbiA1MTcxMSkKKysrIFdlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgJKHdvcmtpbmcgY29weSkK QEAgLTUyLDYgKzUyLDE5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBEbyBub3QgdXNl IHRoaXMgdHlwZSBkaXJlY3RseS4gIFVzZSBSZXNvdXJjZVJlcXVlc3QgaW5zdGVhZC4KICAgICBj bGFzcyBSZXNvdXJjZVJlcXVlc3RCYXNlIHsKICAgICBwdWJsaWM6CisgICAgICAgIC8vIFRoZSB0 eXBlIG9mIHRoaXMgUmVzb3VyY2VSZXF1ZXN0LCBiYXNlZCBvbiBob3cgdGhlIHJlc291cmNlIHdp bGwgYmUgdXNlZC4KKyAgICAgICAgZW51bSBUYXJnZXRUeXBlIHsKKyAgICAgICAgICAgIFRhcmdl dElzTWFpbkZyYW1lLAorICAgICAgICAgICAgVGFyZ2V0SXNTdWJGcmFtZSwKKyAgICAgICAgICAg IFRhcmdldElzU3VicmVzb3VyY2UsICAvLyBSZXNvdXJjZSBpcyBhIGdlbmVyaWMgc3VicmVzb3Vy Y2UuICAoR2VuZXJhbGx5IGEgc3BlY2lmaWMgdHlwZSBzaG91bGQgYmUgc3BlY2lmaWVkKQorICAg ICAgICAgICAgVGFyZ2V0SXNTdHlsZVNoZWV0LAorICAgICAgICAgICAgVGFyZ2V0SXNTY3JpcHQs CisgICAgICAgICAgICBUYXJnZXRJc0ZvbnRSZXNvdXJjZSwKKyAgICAgICAgICAgIFRhcmdldElz SW1hZ2UsCisgICAgICAgICAgICBUYXJnZXRJc09iamVjdCwKKyAgICAgICAgICAgIFRhcmdldElz TWVkaWEKKyAgICAgICAgfTsKKwogICAgICAgICBzdGF0aWMgc3RkOjphdXRvX3B0cjxSZXNvdXJj ZVJlcXVlc3Q+IGFkb3B0KHN0ZDo6YXV0b19wdHI8Q3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3RE YXRhPik7CiAKICAgICAgICAgLy8gR2V0cyBhIGNvcHkgb2YgdGhlIGRhdGEgc3VpdGFibGUgZm9y IHBhc3NpbmcgdG8gYW5vdGhlciB0aHJlYWQuCkBAIC0xMTcsMTIgKzEzMCwxNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgcmVwb3J0VXBsb2FkUHJvZ3Jlc3MoKSBjb25zdCB7 IHJldHVybiBtX3JlcG9ydFVwbG9hZFByb2dyZXNzOyB9CiAgICAgICAgIHZvaWQgc2V0UmVwb3J0 VXBsb2FkUHJvZ3Jlc3MoYm9vbCByZXBvcnRVcGxvYWRQcm9ncmVzcykgeyBtX3JlcG9ydFVwbG9h ZFByb2dyZXNzID0gcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7IH0KIAorICAgICAgICAvLyBXaGF0IHRo aXMgcmVxdWVzdCBpcyBmb3IuCisgICAgICAgIFRhcmdldFR5cGUgdGFyZ2V0VHlwZSgpIGNvbnN0 IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQorICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUoVGFy Z2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KKwogICAgIHByb3RlY3RlZDoK ICAgICAgICAgLy8gVXNlZCB3aGVuIFJlc291cmNlUmVxdWVzdCBpcyBpbml0aWFsaXplZCBmcm9t IGEgcGxhdGZvcm0gcmVwcmVzZW50YXRpb24gb2YgdGhlIHJlcXVlc3QKICAgICAgICAgUmVzb3Vy Y2VSZXF1ZXN0QmFzZSgpCiAgICAgICAgICAgICA6IG1fcmVzb3VyY2VSZXF1ZXN0VXBkYXRlZChm YWxzZSkKICAgICAgICAgICAgICwgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVkKHRydWUpCiAgICAg ICAgICAgICAsIG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3MoZmFsc2UpCisgICAgICAgICAgICAsIG1f dGFyZ2V0VHlwZShUYXJnZXRJc1N1YnJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApA QCAtMTM1LDYgKzE1Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9y ZXNvdXJjZVJlcXVlc3RVcGRhdGVkKHRydWUpCiAgICAgICAgICAgICAsIG1fcGxhdGZvcm1SZXF1 ZXN0VXBkYXRlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9yZXBvcnRVcGxvYWRQcm9ncmVzcyhm YWxzZSkKKyAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3VicmVzb3VyY2UpCiAg ICAgICAgIHsKICAgICAgICAgfQogCkBAIC0xNTQsNiArMTczLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICBtdXRhYmxlIGJvb2wgbV9yZXNvdXJjZVJlcXVlc3RVcGRhdGVkOwogICAg ICAgICBtdXRhYmxlIGJvb2wgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVkOwogICAgICAgICBib29s IG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7CisgICAgICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBl OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBhc1Jlc291 cmNlUmVxdWVzdCgpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9t aXVtL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNTE3MTEpCisrKyBXZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTM3LDIwICszNywxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBjbGFz cyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1ZXN0QmFzZSB7CiAgICAgcHVi bGljOgotICAgICAgICBlbnVtIFRhcmdldFR5cGUgewotICAgICAgICAgICAgVGFyZ2V0SXNNYWlu RnJhbWUsCi0gICAgICAgICAgICBUYXJnZXRJc1N1YkZyYW1lLAotICAgICAgICAgICAgVGFyZ2V0 SXNTdWJSZXNvdXJjZSwKLSAgICAgICAgICAgIFRhcmdldElzT2JqZWN0LAotICAgICAgICAgICAg VGFyZ2V0SXNNZWRpYQotICAgICAgICB9OwotCiAgICAgICAgIFJlc291cmNlUmVxdWVzdChjb25z dCBTdHJpbmcmIHVybCkgCiAgICAgICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UoS1VSTChQ YXJzZWRVUkxTdHJpbmcsIHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAgICAgICAgICAg ICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQo MCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAgICAgLCBtX3Rh cmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAg LTU5LDcgKzUwLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX3JlcXVl c3RvcklEKDApCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAg ICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKLSAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRh cmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgICAgICAsIG1fc2VjdXJpdHlJbmZvKHNlY3VyaXR5 SW5mbykKICAgICAgICAgewogICAgICAgICB9CkBAIC02OSw3ICs1OSw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBt X3JlcXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENhY2hlSG9zdElEKDAp Ci0gICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAg ICB7CiAgICAgICAgIH0KIApAQCAtNzgsNyArNjcsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQ cm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAg ICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAg ICAgICAgc2V0SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpAQCAtODgsNyArNzYs NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkK ICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9h cHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJS ZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTk2LDEwICs4Myw2IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IHJlcXVlc3RvcklEKCkgY29uc3QgeyByZXR1cm4g bV9yZXF1ZXN0b3JJRDsgfQogICAgICAgICB2b2lkIHNldFJlcXVlc3RvcklEKGludCByZXF1ZXN0 b3JJRCkgeyBtX3JlcXVlc3RvcklEID0gcmVxdWVzdG9ySUQ7IH0KIAotICAgICAgICAvLyBXaGF0 IHRoaXMgcmVxdWVzdCBpcyBmb3IuCi0gICAgICAgIFRhcmdldFR5cGUgdGFyZ2V0VHlwZSgpIGNv bnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQotICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUo VGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KLQogICAgICAgICAvLyBU aGUgcHJvY2VzcyBpZCBvZiB0aGUgcHJvY2VzcyBmcm9tIHdoaWNoIHRoaXMgcmVxdWVzdCBvcmln aW5hdGVkLiBJbgogICAgICAgICAvLyB0aGUgY2FzZSBvZiBvdXQtb2YtcHJvY2VzcyBwbHVnaW5z LCB0aGlzIGFsbG93cyB0byBsaW5rIGJhY2sgdGhlCiAgICAgICAgIC8vIHJlcXVlc3QgdG8gdGhl IHBsdWdpbiBwcm9jZXNzIChhcyBpdCBpcyBwcm9jZXNzZWQgdGhyb3VnaCBhIHJlbmRlcgpAQCAt MTI5LDcgKzExMiw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IG1fcmVxdWVz dG9ySUQ7CiAgICAgICAgIGludCBtX3JlcXVlc3RvclByb2Nlc3NJRDsKICAgICAgICAgaW50IG1f YXBwQ2FjaGVIb3N0SUQ7Ci0gICAgICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBlOwogICAgICAg ICBDU3RyaW5nIG1fc2VjdXJpdHlJbmZvOwogICAgIH07CiAK 44444 2009-12-07 16:27:06 -0800 2009-12-08 08:34:12 -0800 Also rename SubFrame to Subframe bug32167a.patch text/plain 8358 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTcxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDktMTItMDQgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE1MgorICAgICAgICBVcGRhdGUg dGhlIFJlc291cmNlUmVxdWVzdDo6UmVxdWVzdFR5cGUuICBUaGlzIHByZXZpb3VzbHkKKyAgICAg ICAgd2FzIHNwZWNpZmljIHRvIENocm9taXVtLiAgTW92ZWQgaW50byBSZXNvdXJjZVJlcXVlc3RC YXNlLCBlbmFibGluZworICAgICAgICBtb3JlIHNwZWNpZmljaXR5IGFib3V0IHRoZSB0eXBlICh3 aGljaCBpcyBvdGhlcndpc2Ugb25seSBrbm93biB0byB0aGUKKyAgICAgICAgbG9hZGVyKSwgYW5k IGFsc28gbWFraW5nIHRoaXMgaW5mb3JtYXRpb24gYXZhaWxhYmxlIHRvIGFsbCBwbGF0Zm9ybXMu CisgICAgICAgIEFueSBwbGF0Zm9ybSB3aXRoIGEgbmV0d29yayBsYXllciB3aGljaCBjYW4gdXRp bGl6ZSB0aGlzIGluZm9ybWF0aW9uCisgICAgICAgIG1heSB3YW50IHRvIHVzZSBpdCBmb3IgcHJp b3JpdGl6YXRpb24uCisKKyAgICAgICAgTm90ZSB0byBDaHJvbWl1bSBnbHVlOiBUYXJnZXRJc1N1 YlJlc291cmNlIHJlbmFtZWQgdG8gVGFyZ2V0SXNTdWJyZXNvdXJjZS4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIGxvYWRlci9sb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TG9hZGVyOjpMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVz b3VyY2VUeXBlVG9UYXJnZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkxvYWRlcjo6SG9zdDo6 c2VydmVQZW5kaW5nUmVxdWVzdHMpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VSZXF1ZXN0QmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJhc2U6OnRhcmdldFR5cGUpOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6c2V0VGFyZ2V0VHlwZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3RCYXNlOjpSZXNvdXJjZVJlcXVlc3RCYXNl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5o OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgor CiAyMDA5LTEyLTA0ICBBbGJlcnQgSi4gV29uZyAgPGFqd29uZ0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgTm90IHJldmlld2VkOiBjaHJvbWl1bSBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL2xv YWRlci9sb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL2xvYWRlci5jcHAJ KHJldmlzaW9uIDUxNzExKQorKysgV2ViQ29yZS9sb2FkZXIvbG9hZGVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjEsNyArNjEsOSBAQCBMb2FkZXI6OkxvYWRlcigpCiAgICAgLCBtX2lzU3VzcGVu ZGluZ1BlbmRpbmdSZXF1ZXN0cyhmYWxzZSkKIHsKICAgICBtX25vbkhUVFBQcm90b2NvbEhvc3Qg PSBIb3N0OjpjcmVhdGUoQXRvbWljU3RyaW5nKCksIG1heFJlcXVlc3RzSW5GbGlnaHRGb3JOb25I VFRQUHJvdG9jb2xzKTsKKyNpZiBSRVFVRVNUX01BTkFHRU1FTlRfRU5BQkxFRAogICAgIG1heFJl cXVlc3RzSW5GbGlnaHRQZXJIb3N0ID0gaW5pdGlhbGl6ZU1heGltdW1IVFRQQ29ubmVjdGlvbkNv dW50UGVySG9zdCgpOworI2VuZGlmCiB9CiAKIExvYWRlcjo6fkxvYWRlcigpCkBAIC02OSw2ICs3 MSwyNyBAQCBMb2FkZXI6On5Mb2FkZXIoKQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQog ICAgIAorUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRUeXBlIGNhY2hlZFJlc291cmNlVHlwZVRvVGFy Z2V0VHlwZShDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlKQoreworICAgIHN3aXRjaCAodHlwZSkg eworICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkNTU1N0eWxlU2hlZXQ6CisjaWYgRU5BQkxFKFhT TFQpCisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6WFNMU3R5bGVTaGVldDoKKyNlbmRpZgorI2lm IEVOQUJMRShYQkwpCisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6WEJMOgorI2VuZGlmCisgICAg ICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzU3R5bGVTaGVldDsKKyAgICBjYXNl IENhY2hlZFJlc291cmNlOjpTY3JpcHQ6IAorICAgICAgICByZXR1cm4gUmVzb3VyY2VSZXF1ZXN0 OjpUYXJnZXRJc1NjcmlwdDsKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpGb250UmVzb3VyY2U6 CisgICAgICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzRm9udFJlc291cmNlOwor ICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2U6CisgICAgICAgIHJldHVybiBS ZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2U7CisgICAgfQorICAgIHJldHVybiBSZXNvdXJj ZVJlcXVlc3Q6OlRhcmdldElzU3VicmVzb3VyY2U7Cit9CisKIExvYWRlcjo6UHJpb3JpdHkgTG9h ZGVyOjpkZXRlcm1pbmVQcmlvcml0eShjb25zdCBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UpIGNv bnN0CiB7CiAjaWYgUkVRVUVTVF9NQU5BR0VNRU5UX0VOQUJMRUQKQEAgLTI5OSw2ICszMjIsNyBA QCB2b2lkIExvYWRlcjo6SG9zdDo6c2VydmVQZW5kaW5nUmVxdWVzdHMoCiAgICAgICAgIHJlcXVl c3RzUGVuZGluZy5yZW1vdmVGaXJzdCgpOwogICAgICAgICAKICAgICAgICAgUmVzb3VyY2VSZXF1 ZXN0IHJlc291cmNlUmVxdWVzdChyZXF1ZXN0LT5jYWNoZWRSZXNvdXJjZSgpLT51cmwoKSk7Cisg ICAgICAgIHJlc291cmNlUmVxdWVzdC5zZXRUYXJnZXRUeXBlKGNhY2hlZFJlc291cmNlVHlwZVRv VGFyZ2V0VHlwZShyZXF1ZXN0LT5jYWNoZWRSZXNvdXJjZSgpLT50eXBlKCkpKTsKICAgICAgICAg CiAgICAgICAgIGlmICghcmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKS0+YWNjZXB0KCkuaXNFbXB0 eSgpKQogICAgICAgICAgICAgcmVzb3VyY2VSZXF1ZXN0LnNldEhUVFBBY2NlcHQocmVxdWVzdC0+ Y2FjaGVkUmVzb3VyY2UoKS0+YWNjZXB0KCkpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCShyZXZpc2lvbiA1MTcxMSkKKysrIFdlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgJKHdvcmtpbmcgY29weSkK QEAgLTUyLDYgKzUyLDE5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBEbyBub3QgdXNl IHRoaXMgdHlwZSBkaXJlY3RseS4gIFVzZSBSZXNvdXJjZVJlcXVlc3QgaW5zdGVhZC4KICAgICBj bGFzcyBSZXNvdXJjZVJlcXVlc3RCYXNlIHsKICAgICBwdWJsaWM6CisgICAgICAgIC8vIFRoZSB0 eXBlIG9mIHRoaXMgUmVzb3VyY2VSZXF1ZXN0LCBiYXNlZCBvbiBob3cgdGhlIHJlc291cmNlIHdp bGwgYmUgdXNlZC4KKyAgICAgICAgZW51bSBUYXJnZXRUeXBlIHsKKyAgICAgICAgICAgIFRhcmdl dElzTWFpbkZyYW1lLAorICAgICAgICAgICAgVGFyZ2V0SXNTdWJmcmFtZSwKKyAgICAgICAgICAg IFRhcmdldElzU3VicmVzb3VyY2UsICAvLyBSZXNvdXJjZSBpcyBhIGdlbmVyaWMgc3VicmVzb3Vy Y2UuICAoR2VuZXJhbGx5IGEgc3BlY2lmaWMgdHlwZSBzaG91bGQgYmUgc3BlY2lmaWVkKQorICAg ICAgICAgICAgVGFyZ2V0SXNTdHlsZVNoZWV0LAorICAgICAgICAgICAgVGFyZ2V0SXNTY3JpcHQs CisgICAgICAgICAgICBUYXJnZXRJc0ZvbnRSZXNvdXJjZSwKKyAgICAgICAgICAgIFRhcmdldElz SW1hZ2UsCisgICAgICAgICAgICBUYXJnZXRJc09iamVjdCwKKyAgICAgICAgICAgIFRhcmdldElz TWVkaWEKKyAgICAgICAgfTsKKwogICAgICAgICBzdGF0aWMgc3RkOjphdXRvX3B0cjxSZXNvdXJj ZVJlcXVlc3Q+IGFkb3B0KHN0ZDo6YXV0b19wdHI8Q3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3RE YXRhPik7CiAKICAgICAgICAgLy8gR2V0cyBhIGNvcHkgb2YgdGhlIGRhdGEgc3VpdGFibGUgZm9y IHBhc3NpbmcgdG8gYW5vdGhlciB0aHJlYWQuCkBAIC0xMTcsMTIgKzEzMCwxNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgcmVwb3J0VXBsb2FkUHJvZ3Jlc3MoKSBjb25zdCB7 IHJldHVybiBtX3JlcG9ydFVwbG9hZFByb2dyZXNzOyB9CiAgICAgICAgIHZvaWQgc2V0UmVwb3J0 VXBsb2FkUHJvZ3Jlc3MoYm9vbCByZXBvcnRVcGxvYWRQcm9ncmVzcykgeyBtX3JlcG9ydFVwbG9h ZFByb2dyZXNzID0gcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7IH0KIAorICAgICAgICAvLyBXaGF0IHRo aXMgcmVxdWVzdCBpcyBmb3IuCisgICAgICAgIFRhcmdldFR5cGUgdGFyZ2V0VHlwZSgpIGNvbnN0 IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQorICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUoVGFy Z2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KKwogICAgIHByb3RlY3RlZDoK ICAgICAgICAgLy8gVXNlZCB3aGVuIFJlc291cmNlUmVxdWVzdCBpcyBpbml0aWFsaXplZCBmcm9t IGEgcGxhdGZvcm0gcmVwcmVzZW50YXRpb24gb2YgdGhlIHJlcXVlc3QKICAgICAgICAgUmVzb3Vy Y2VSZXF1ZXN0QmFzZSgpCiAgICAgICAgICAgICA6IG1fcmVzb3VyY2VSZXF1ZXN0VXBkYXRlZChm YWxzZSkKICAgICAgICAgICAgICwgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVkKHRydWUpCiAgICAg ICAgICAgICAsIG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3MoZmFsc2UpCisgICAgICAgICAgICAsIG1f dGFyZ2V0VHlwZShUYXJnZXRJc1N1YnJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApA QCAtMTM1LDYgKzE1Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9y ZXNvdXJjZVJlcXVlc3RVcGRhdGVkKHRydWUpCiAgICAgICAgICAgICAsIG1fcGxhdGZvcm1SZXF1 ZXN0VXBkYXRlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9yZXBvcnRVcGxvYWRQcm9ncmVzcyhm YWxzZSkKKyAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3VicmVzb3VyY2UpCiAg ICAgICAgIHsKICAgICAgICAgfQogCkBAIC0xNTQsNiArMTczLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICBtdXRhYmxlIGJvb2wgbV9yZXNvdXJjZVJlcXVlc3RVcGRhdGVkOwogICAg ICAgICBtdXRhYmxlIGJvb2wgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVkOwogICAgICAgICBib29s IG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7CisgICAgICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBl OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBhc1Jlc291 cmNlUmVxdWVzdCgpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9t aXVtL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNTE3MTEpCisrKyBXZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTM3LDIwICszNywxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBjbGFz cyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1ZXN0QmFzZSB7CiAgICAgcHVi bGljOgotICAgICAgICBlbnVtIFRhcmdldFR5cGUgewotICAgICAgICAgICAgVGFyZ2V0SXNNYWlu RnJhbWUsCi0gICAgICAgICAgICBUYXJnZXRJc1N1YkZyYW1lLAotICAgICAgICAgICAgVGFyZ2V0 SXNTdWJSZXNvdXJjZSwKLSAgICAgICAgICAgIFRhcmdldElzT2JqZWN0LAotICAgICAgICAgICAg VGFyZ2V0SXNNZWRpYQotICAgICAgICB9OwotCiAgICAgICAgIFJlc291cmNlUmVxdWVzdChjb25z dCBTdHJpbmcmIHVybCkgCiAgICAgICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UoS1VSTChQ YXJzZWRVUkxTdHJpbmcsIHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAgICAgICAgICAg ICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQo MCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAgICAgLCBtX3Rh cmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAg LTU5LDcgKzUwLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX3JlcXVl c3RvcklEKDApCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAg ICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKLSAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRh cmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgICAgICAsIG1fc2VjdXJpdHlJbmZvKHNlY3VyaXR5 SW5mbykKICAgICAgICAgewogICAgICAgICB9CkBAIC02OSw3ICs1OSw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBt X3JlcXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENhY2hlSG9zdElEKDAp Ci0gICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAg ICB7CiAgICAgICAgIH0KIApAQCAtNzgsNyArNjcsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQ cm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAg ICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAg ICAgICAgc2V0SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpAQCAtODgsNyArNzYs NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkK ICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9h cHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJS ZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTk2LDEwICs4Myw2IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IHJlcXVlc3RvcklEKCkgY29uc3QgeyByZXR1cm4g bV9yZXF1ZXN0b3JJRDsgfQogICAgICAgICB2b2lkIHNldFJlcXVlc3RvcklEKGludCByZXF1ZXN0 b3JJRCkgeyBtX3JlcXVlc3RvcklEID0gcmVxdWVzdG9ySUQ7IH0KIAotICAgICAgICAvLyBXaGF0 IHRoaXMgcmVxdWVzdCBpcyBmb3IuCi0gICAgICAgIFRhcmdldFR5cGUgdGFyZ2V0VHlwZSgpIGNv bnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQotICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUo VGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KLQogICAgICAgICAvLyBU aGUgcHJvY2VzcyBpZCBvZiB0aGUgcHJvY2VzcyBmcm9tIHdoaWNoIHRoaXMgcmVxdWVzdCBvcmln aW5hdGVkLiBJbgogICAgICAgICAvLyB0aGUgY2FzZSBvZiBvdXQtb2YtcHJvY2VzcyBwbHVnaW5z LCB0aGlzIGFsbG93cyB0byBsaW5rIGJhY2sgdGhlCiAgICAgICAgIC8vIHJlcXVlc3QgdG8gdGhl IHBsdWdpbiBwcm9jZXNzIChhcyBpdCBpcyBwcm9jZXNzZWQgdGhyb3VnaCBhIHJlbmRlcgpAQCAt MTI5LDcgKzExMiw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IG1fcmVxdWVz dG9ySUQ7CiAgICAgICAgIGludCBtX3JlcXVlc3RvclByb2Nlc3NJRDsKICAgICAgICAgaW50IG1f YXBwQ2FjaGVIb3N0SUQ7Ci0gICAgICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBlOwogICAgICAg ICBDU3RyaW5nIG1fc2VjdXJpdHlJbmZvOwogICAgIH07CiAK 44474 2009-12-08 08:34:12 -0800 2009-12-08 09:05:07 -0800 oops the oops. bug32167b.patch text/plain 8313 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTg1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMTItMDQgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIxNTIKKyAgICAgICAgVXBkYXRlIHRo ZSBSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3RUeXBlLiAgVGhpcyBwcmV2aW91c2x5CisgICAgICAg IHdhcyBzcGVjaWZpYyB0byBDaHJvbWl1bS4gIE1vdmVkIGludG8gUmVzb3VyY2VSZXF1ZXN0QmFz ZSwgZW5hYmxpbmcKKyAgICAgICAgbW9yZSBzcGVjaWZpY2l0eSBhYm91dCB0aGUgdHlwZSAod2hp Y2ggaXMgb3RoZXJ3aXNlIG9ubHkga25vd24gdG8gdGhlCisgICAgICAgIGxvYWRlciksIGFuZCBh bHNvIG1ha2luZyB0aGlzIGluZm9ybWF0aW9uIGF2YWlsYWJsZSB0byBhbGwgcGxhdGZvcm1zLgor ICAgICAgICBBbnkgcGxhdGZvcm0gd2l0aCBhIG5ldHdvcmsgbGF5ZXIgd2hpY2ggY2FuIHV0aWxp emUgdGhpcyBpbmZvcm1hdGlvbgorICAgICAgICBtYXkgd2FudCB0byB1c2UgaXQgZm9yIHByaW9y aXRpemF0aW9uLgorCisgICAgICAgIE5vdGUgdG8gQ2hyb21pdW0gZ2x1ZTogVGFyZ2V0SXNTdWJS ZXNvdXJjZSByZW5hbWVkIHRvIFRhcmdldElzU3VicmVzb3VyY2UuCisKKyAgICAgICAgKiBsb2Fk ZXIvbG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxvYWRlcjo6TG9hZGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlVHlwZVRvVGFyZ2V0VHlwZSk6CisgICAgICAgIChX ZWJDb3JlOjpMb2FkZXI6Okhvc3Q6OnNlcnZlUGVuZGluZ1JlcXVlc3RzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdEJhc2U6Oik6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3RCYXNlOjp0YXJnZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJh c2U6OnNldFRhcmdldFR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFz ZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJv bWl1bS9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dDo6UmVzb3VyY2VSZXF1ZXN0KToKKwogMjAwOS0xMi0wOCAgQ2Fyb2wgU3phYm8gIDxjYXJvbC5z emFib0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4 OiBXZWJDb3JlL2xvYWRlci9sb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVy L2xvYWRlci5jcHAJKHJldmlzaW9uIDUxODU0KQorKysgV2ViQ29yZS9sb2FkZXIvbG9hZGVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsOSBAQCBMb2FkZXI6OkxvYWRlcigpCiAgICAg LCBtX2lzU3VzcGVuZGluZ1BlbmRpbmdSZXF1ZXN0cyhmYWxzZSkKIHsKICAgICBtX25vbkhUVFBQ cm90b2NvbEhvc3QgPSBIb3N0OjpjcmVhdGUoQXRvbWljU3RyaW5nKCksIG1heFJlcXVlc3RzSW5G bGlnaHRGb3JOb25IVFRQUHJvdG9jb2xzKTsKKyNpZiBSRVFVRVNUX01BTkFHRU1FTlRfRU5BQkxF RAogICAgIG1heFJlcXVlc3RzSW5GbGlnaHRQZXJIb3N0ID0gaW5pdGlhbGl6ZU1heGltdW1IVFRQ Q29ubmVjdGlvbkNvdW50UGVySG9zdCgpOworI2VuZGlmCiB9CiAKIExvYWRlcjo6fkxvYWRlcigp CkBAIC02OSw2ICs3MSwyNyBAQCBMb2FkZXI6On5Mb2FkZXIoKQogICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogfQogICAgIAorUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRUeXBlIGNhY2hlZFJlc291 cmNlVHlwZVRvVGFyZ2V0VHlwZShDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlKQoreworICAgIHN3 aXRjaCAodHlwZSkgeworICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkNTU1N0eWxlU2hlZXQ6Cisj aWYgRU5BQkxFKFhTTFQpCisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6WFNMU3R5bGVTaGVldDoK KyNlbmRpZgorI2lmIEVOQUJMRShYQkwpCisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6WEJMOgor I2VuZGlmCisgICAgICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzU3R5bGVTaGVl dDsKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpTY3JpcHQ6IAorICAgICAgICByZXR1cm4gUmVz b3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1NjcmlwdDsKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpG b250UmVzb3VyY2U6CisgICAgICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzRm9u dFJlc291cmNlOworICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2U6CisgICAg ICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2U7CisgICAgfQorICAgIHJl dHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzU3VicmVzb3VyY2U7Cit9CisKIExvYWRlcjo6 UHJpb3JpdHkgTG9hZGVyOjpkZXRlcm1pbmVQcmlvcml0eShjb25zdCBDYWNoZWRSZXNvdXJjZSog cmVzb3VyY2UpIGNvbnN0CiB7CiAjaWYgUkVRVUVTVF9NQU5BR0VNRU5UX0VOQUJMRUQKQEAgLTI5 OSw2ICszMjIsNyBAQCB2b2lkIExvYWRlcjo6SG9zdDo6c2VydmVQZW5kaW5nUmVxdWVzdHMoCiAg ICAgICAgIHJlcXVlc3RzUGVuZGluZy5yZW1vdmVGaXJzdCgpOwogICAgICAgICAKICAgICAgICAg UmVzb3VyY2VSZXF1ZXN0IHJlc291cmNlUmVxdWVzdChyZXF1ZXN0LT5jYWNoZWRSZXNvdXJjZSgp LT51cmwoKSk7CisgICAgICAgIHJlc291cmNlUmVxdWVzdC5zZXRUYXJnZXRUeXBlKGNhY2hlZFJl c291cmNlVHlwZVRvVGFyZ2V0VHlwZShyZXF1ZXN0LT5jYWNoZWRSZXNvdXJjZSgpLT50eXBlKCkp KTsKICAgICAgICAgCiAgICAgICAgIGlmICghcmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKS0+YWNj ZXB0KCkuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmVzb3VyY2VSZXF1ZXN0LnNldEhUVFBBY2Nl cHQocmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKS0+YWNjZXB0KCkpOwpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCShyZXZpc2lvbiA1MTg1 NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgJKHdv cmtpbmcgY29weSkKQEAgLTUyLDYgKzUyLDE5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAv LyBEbyBub3QgdXNlIHRoaXMgdHlwZSBkaXJlY3RseS4gIFVzZSBSZXNvdXJjZVJlcXVlc3QgaW5z dGVhZC4KICAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3RCYXNlIHsKICAgICBwdWJsaWM6CisgICAg ICAgIC8vIFRoZSB0eXBlIG9mIHRoaXMgUmVzb3VyY2VSZXF1ZXN0LCBiYXNlZCBvbiBob3cgdGhl IHJlc291cmNlIHdpbGwgYmUgdXNlZC4KKyAgICAgICAgZW51bSBUYXJnZXRUeXBlIHsKKyAgICAg ICAgICAgIFRhcmdldElzTWFpbkZyYW1lLAorICAgICAgICAgICAgVGFyZ2V0SXNTdWJmcmFtZSwK KyAgICAgICAgICAgIFRhcmdldElzU3VicmVzb3VyY2UsICAvLyBSZXNvdXJjZSBpcyBhIGdlbmVy aWMgc3VicmVzb3VyY2UuICAoR2VuZXJhbGx5IGEgc3BlY2lmaWMgdHlwZSBzaG91bGQgYmUgc3Bl Y2lmaWVkKQorICAgICAgICAgICAgVGFyZ2V0SXNTdHlsZVNoZWV0LAorICAgICAgICAgICAgVGFy Z2V0SXNTY3JpcHQsCisgICAgICAgICAgICBUYXJnZXRJc0ZvbnRSZXNvdXJjZSwKKyAgICAgICAg ICAgIFRhcmdldElzSW1hZ2UsCisgICAgICAgICAgICBUYXJnZXRJc09iamVjdCwKKyAgICAgICAg ICAgIFRhcmdldElzTWVkaWEKKyAgICAgICAgfTsKKwogICAgICAgICBzdGF0aWMgc3RkOjphdXRv X3B0cjxSZXNvdXJjZVJlcXVlc3Q+IGFkb3B0KHN0ZDo6YXV0b19wdHI8Q3Jvc3NUaHJlYWRSZXNv dXJjZVJlcXVlc3REYXRhPik7CiAKICAgICAgICAgLy8gR2V0cyBhIGNvcHkgb2YgdGhlIGRhdGEg c3VpdGFibGUgZm9yIHBhc3NpbmcgdG8gYW5vdGhlciB0aHJlYWQuCkBAIC0xMTcsMTIgKzEzMCwx NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgcmVwb3J0VXBsb2FkUHJvZ3Jl c3MoKSBjb25zdCB7IHJldHVybiBtX3JlcG9ydFVwbG9hZFByb2dyZXNzOyB9CiAgICAgICAgIHZv aWQgc2V0UmVwb3J0VXBsb2FkUHJvZ3Jlc3MoYm9vbCByZXBvcnRVcGxvYWRQcm9ncmVzcykgeyBt X3JlcG9ydFVwbG9hZFByb2dyZXNzID0gcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7IH0KIAorICAgICAg ICAvLyBXaGF0IHRoaXMgcmVxdWVzdCBpcyBmb3IuCisgICAgICAgIFRhcmdldFR5cGUgdGFyZ2V0 VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQorICAgICAgICB2b2lkIHNldFRh cmdldFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KKwogICAg IHByb3RlY3RlZDoKICAgICAgICAgLy8gVXNlZCB3aGVuIFJlc291cmNlUmVxdWVzdCBpcyBpbml0 aWFsaXplZCBmcm9tIGEgcGxhdGZvcm0gcmVwcmVzZW50YXRpb24gb2YgdGhlIHJlcXVlc3QKICAg ICAgICAgUmVzb3VyY2VSZXF1ZXN0QmFzZSgpCiAgICAgICAgICAgICA6IG1fcmVzb3VyY2VSZXF1 ZXN0VXBkYXRlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVk KHRydWUpCiAgICAgICAgICAgICAsIG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3MoZmFsc2UpCisgICAg ICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YnJlc291cmNlKQogICAgICAgICB7CiAg ICAgICAgIH0KIApAQCAtMTM1LDYgKzE1Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgICAgICwgbV9yZXNvdXJjZVJlcXVlc3RVcGRhdGVkKHRydWUpCiAgICAgICAgICAgICAsIG1f cGxhdGZvcm1SZXF1ZXN0VXBkYXRlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9yZXBvcnRVcGxv YWRQcm9ncmVzcyhmYWxzZSkKKyAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3Vi cmVzb3VyY2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC0xNTQsNiArMTczLDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBtdXRhYmxlIGJvb2wgbV9yZXNvdXJjZVJlcXVlc3RV cGRhdGVkOwogICAgICAgICBtdXRhYmxlIGJvb2wgbV9wbGF0Zm9ybVJlcXVlc3RVcGRhdGVkOwog ICAgICAgICBib29sIG1fcmVwb3J0VXBsb2FkUHJvZ3Jlc3M7CisgICAgICAgIFRhcmdldFR5cGUg bV90YXJnZXRUeXBlOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiBhc1Jlc291cmNlUmVxdWVzdCgpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNTE4 NTQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0 LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDIwICszNywxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1ZXN0QmFz ZSB7CiAgICAgcHVibGljOgotICAgICAgICBlbnVtIFRhcmdldFR5cGUgewotICAgICAgICAgICAg VGFyZ2V0SXNNYWluRnJhbWUsCi0gICAgICAgICAgICBUYXJnZXRJc1N1YkZyYW1lLAotICAgICAg ICAgICAgVGFyZ2V0SXNTdWJSZXNvdXJjZSwKLSAgICAgICAgICAgIFRhcmdldElzT2JqZWN0LAot ICAgICAgICAgICAgVGFyZ2V0SXNNZWRpYQotICAgICAgICB9OwotCiAgICAgICAgIFJlc291cmNl UmVxdWVzdChjb25zdCBTdHJpbmcmIHVybCkgCiAgICAgICAgICAgICA6IFJlc291cmNlUmVxdWVz dEJhc2UoS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kp CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0 b3JQcm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAg ICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAg ICAgICB9CiAKQEAgLTU5LDcgKzUwLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAg ICAgLCBtX3JlcXVlc3RvcklEKDApCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lE KDApCiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKLSAgICAgICAgICAgICwgbV90 YXJnZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgICAgICAsIG1fc2VjdXJpdHlJ bmZvKHNlY3VyaXR5SW5mbykKICAgICAgICAgewogICAgICAgICB9CkBAIC02OSw3ICs1OSw2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAg ICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENh Y2hlSG9zdElEKDApCi0gICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291 cmNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtNzgsNyArNjcsNiBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwg bV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgw KQotICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAg ICAgewogICAgICAgICAgICAgc2V0SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpA QCAtODgsNyArNzYsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVx dWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAg ICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQotICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUo VGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTk2LDEwICs4 Myw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IHJlcXVlc3RvcklEKCkgY29u c3QgeyByZXR1cm4gbV9yZXF1ZXN0b3JJRDsgfQogICAgICAgICB2b2lkIHNldFJlcXVlc3RvcklE KGludCByZXF1ZXN0b3JJRCkgeyBtX3JlcXVlc3RvcklEID0gcmVxdWVzdG9ySUQ7IH0KIAotICAg ICAgICAvLyBXaGF0IHRoaXMgcmVxdWVzdCBpcyBmb3IuCi0gICAgICAgIFRhcmdldFR5cGUgdGFy Z2V0VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQotICAgICAgICB2b2lkIHNl dFRhcmdldFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KLQog ICAgICAgICAvLyBUaGUgcHJvY2VzcyBpZCBvZiB0aGUgcHJvY2VzcyBmcm9tIHdoaWNoIHRoaXMg cmVxdWVzdCBvcmlnaW5hdGVkLiBJbgogICAgICAgICAvLyB0aGUgY2FzZSBvZiBvdXQtb2YtcHJv Y2VzcyBwbHVnaW5zLCB0aGlzIGFsbG93cyB0byBsaW5rIGJhY2sgdGhlCiAgICAgICAgIC8vIHJl cXVlc3QgdG8gdGhlIHBsdWdpbiBwcm9jZXNzIChhcyBpdCBpcyBwcm9jZXNzZWQgdGhyb3VnaCBh IHJlbmRlcgpAQCAtMTI5LDcgKzExMiw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg aW50IG1fcmVxdWVzdG9ySUQ7CiAgICAgICAgIGludCBtX3JlcXVlc3RvclByb2Nlc3NJRDsKICAg ICAgICAgaW50IG1fYXBwQ2FjaGVIb3N0SUQ7Ci0gICAgICAgIFRhcmdldFR5cGUgbV90YXJnZXRU eXBlOwogICAgICAgICBDU3RyaW5nIG1fc2VjdXJpdHlJbmZvOwogICAgIH07CiAK