80713 2012-03-09 11:40:48 -0800 Add new methods to FrameLoaderClient so different WebKit ports can customize the ResourceRequest when it is created. 2014-03-03 07:25:04 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 80519 0 liachen webkit-unassigned abarth ap darin dglazkov fishd gustavo japhet jochen joenotcharles menard pnormand webkit.review.bot xan.lopez oldest_to_newest 575033 0 liachen 2012-03-09 11:40:48 -0800 Right now there are many port-specific stuff in ResourceRequest, but they are not always correctly setup at the right time, like the ResourceRequest::TargetType for BlackBerry and Chromium platform. There are some #ifdef platform stuff in PingLoader/CachedResource/Worker/WorkerScriptLoader/XMLHttpRequest, adding the following callback in FrameLoaderClient and calling them at the right time can move these #ifdef into platform specific codes. virtual void addExtraFieldsToSubresourceRequest(ResourceRequest& request, FrameLoadType loadType, CachedResource::Type resourceType) { }; virtual void addExtraFieldsToMainResourceRequest(ResourceRequest& request, FrameLoadType type) { }; 575039 1 131066 liachen 2012-03-09 11:49:12 -0800 Created attachment 131066 Suggested patch for 80713 575045 2 liachen 2012-03-09 11:56:26 -0800 Add Darin Adler and Darin Fisher to CC list. darin & fishd: Sorry for adding both of you into this bug, do you have any comments to my patch? 575048 3 liachen 2012-03-09 11:58:29 -0800 Forgot to add jochen. jochen: any comments? 575054 4 jochen 2012-03-09 12:06:37 -0800 how would you in this model annotate e.g. the request fired for XMLHttpRequests? 575056 5 131066 buildbot 2012-03-09 12:06:57 -0800 Comment on attachment 131066 Suggested patch for 80713 Attachment 131066 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/11904679 575060 6 liachen 2012-03-09 12:10:27 -0800 (In reply to comment #4) > how would you in this model annotate e.g. the request fired for XMLHttpRequests? When FrameLoaderClient::addExtraFieldsToSubresourceRequest() is called, do what you are doing now in willSendRequest(). This is like willSendRequest(), just it is called before any policy checking. 575066 7 131066 webkit.review.bot 2012-03-09 12:16:32 -0800 Comment on attachment 131066 Suggested patch for 80713 Attachment 131066 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11911689 575072 8 131066 webkit-ews 2012-03-09 12:18:46 -0800 Comment on attachment 131066 Suggested patch for 80713 Attachment 131066 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/11915633 575076 9 jochen 2012-03-09 12:22:19 -0800 (In reply to comment #6) > (In reply to comment #4) > > how would you in this model annotate e.g. the request fired for XMLHttpRequests? > > When FrameLoaderClient::addExtraFieldsToSubresourceRequest() is called, do what you are doing now in willSendRequest(). That is not invoked by XMLHttpRequest.cpp, so the information that this is an XHR is lost. > > This is like willSendRequest(), just it is called before any policy checking. that currently relies on the TargetType being set. I thought the point of this is getting rid of the TargetType? 575080 10 131066 webkit-ews 2012-03-09 12:29:55 -0800 Comment on attachment 131066 Suggested patch for 80713 Attachment 131066 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11894751 575083 11 liachen 2012-03-09 12:37:20 -0800 (In reply to comment #9) > > That is not invoked by XMLHttpRequest.cpp, so the information that this is an XHR is lost. For loads not going through FrameLoader, like XMLHttpRequest, I will have to make call to addExtraFieldsToSubresourceRequest(), or a new addExtraFieldsToResourceRequest(). Thanks for pointing this out. > that currently relies on the TargetType being set. I thought the point of this is getting rid of the TargetType? The patch here is not exactly to get rid of TargetType, it is just to get rid of TargetType, and any other platform specific stuff, from loader (and other cross platform codes). And make it easier for us to add more platform specific to ResourceRequest without changing cross-platform stuff. 575122 12 131066 gyuyoung.kim 2012-03-09 13:02:11 -0800 Comment on attachment 131066 Suggested patch for 80713 Attachment 131066 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/11903749 575226 13 liachen 2012-03-09 14:26:38 -0800 (In reply to comment #9) > That is not invoked by XMLHttpRequest.cpp, so the information that this is an XHR is lost. > Are you sure? Just checked my callstack, it is called for XMLHttpRequest in SubresourceLoader::create(). 575293 14 ap 2012-03-09 15:19:27 -0800 Customizing headers is really what dispatchWillSendRequest is for. 575314 15 131066 gustavo 2012-03-09 16:02:17 -0800 Comment on attachment 131066 Suggested patch for 80713 Attachment 131066 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11894839 575398 16 liachen 2012-03-09 18:36:12 -0800 (In reply to comment #14) > Customizing headers is really what dispatchWillSendRequest is for. The problem for dispatchWillSendRequest() is: * It is called after dispatchDecidePolicyForXXX(), during which some aspects, like TargetType of ResourceRequest, could be checked, so it is too late to set it in dispatchWillSendRequest(). * In dispatchWillSendRequest(), some info, like resource type, is not available, make it harder to do some customizing. 576244 17 131346 liachen 2012-03-12 10:29:47 -0700 Created attachment 131346 Update patch so it compiles. 576267 18 131346 webkit-ews 2012-03-12 10:48:04 -0700 Comment on attachment 131346 Update patch so it compiles. Attachment 131346 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/11938962 576271 19 131346 webkit-ews 2012-03-12 10:51:21 -0700 Comment on attachment 131346 Update patch so it compiles. Attachment 131346 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11943001 576287 20 131346 gustavo 2012-03-12 11:08:32 -0700 Comment on attachment 131346 Update patch so it compiles. Attachment 131346 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11939945 576297 21 131346 gyuyoung.kim 2012-03-12 11:16:05 -0700 Comment on attachment 131346 Update patch so it compiles. Attachment 131346 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/11940958 576300 22 131358 liachen 2012-03-12 11:19:29 -0700 Created attachment 131358 Patch fixed GStreamer compile error. 576312 23 ap 2012-03-12 11:26:34 -0700 It still feels entirely wrong to me to add two new callbacks when there is already one designed largely for the same purpose. 576328 24 131358 buildbot 2012-03-12 11:36:47 -0700 Comment on attachment 131358 Patch fixed GStreamer compile error. Attachment 131358 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/11940970 576333 25 liachen 2012-03-12 11:40:33 -0700 (In reply to comment #23) > It still feels entirely wrong to me to add two new callbacks when there is already one designed largely for the same purpose. Hi, Alexey: Yeah, I agree with that. But considering the timing issue, would removing willSendRequest() make things more logical and more acceptable? Or change willSendRequest(const ResourceRequest&) so it becomes just a notification? 576406 26 joenotcharles 2012-03-12 12:49:15 -0700 (In reply to comment #23) > It still feels entirely wrong to me to add two new callbacks when there is already one designed largely for the same purpose. Well, it seems to me that if the platform is allowed to make customizations to the request, it should be allowed to do it before dispatchDecidePolicyForXXX. Moving willSendRequest before that doesn't seem right, since until dispatchDecidePolicyForXXX returns PolicyUse, it's not guaranteed the request will be sent. And the name of "willSendRequest" doesn't tell me that it's intended for altering the request - it tells me that it's intended to be a notification that a request is about to be sent. The fact that it has a non-const parameter which can be altered isn't clear from the name. It seems reasonable to me to have two entry points to customize the request, one before dispatchDecidePolicy and one only for requests that will actually be sent. For instance, the platform might want to do one set of customizations that applies both to PolicyUse and PolicyDownload, and another that applies only to PolicyUse. I don't like the name of the two new methods, though. First, they can be used to update existing fields as well as add new fields, so "addExtraFields" doesn't seem right. Second, I think we should have just one new method, with an enum parameter saying whether it's a main resource of subresource request. I suggest calling it "customizeRequest", or to be more explicit about timing, "customizeRequestBeforePolicyCheck". 576419 27 ap 2012-03-12 12:59:15 -0700 > Well, it seems to me that if the platform is allowed to make customizations to the request, it should be allowed to do it before dispatchDecidePolicyForXXX. Could you please elaborate on why you think so? Surely client code doesn't need to have the modifications it can make itself already applied to request in order to make the decision in dispatchDecidePolicyForXXX. 576421 28 liachen 2012-03-12 13:02:05 -0700 (In reply to comment #26) > I don't like the name of the two new methods, though. First, they can be used to update existing fields as well as add new fields, so "addExtraFields" doesn't seem right. Second, I think we should have just one new method, with an enum parameter saying whether it's a main resource of subresource request. I suggest calling it "customizeRequest", or to be more explicit about timing, "customizeRequestBeforePolicyCheck". Yeah, the method name is not well chosen and I am more than willing to change them to more proper name. But I think the resource type for subresource load is needed to better understand what this request for, and for better customization. 576432 29 liachen 2012-03-12 13:08:27 -0700 (In reply to comment #27) > > Well, it seems to me that if the platform is allowed to make customizations to the request, it should be allowed to do it before dispatchDecidePolicyForXXX. > > Could you please elaborate on why you think so? Surely client code doesn't need to have the modifications it can make itself already applied to request in order to make the decision in dispatchDecidePolicyForXXX. The point is, it could check the info, like TargetType, to do the decision whether to allow the loading to go ahead or not, or handle specially. And this target type info is related to the sub-resource type, and/or the load type. The sub-resource type is not available in dispatchDecidePolicyForXXX(). And these 2 new methods, along with its 2 parameters, provide a way for client to remember these info. Of course, if we can add TargetType, along with other things, to cross-platform codes, then these are not necessary. 576448 30 liachen 2012-03-12 13:18:05 -0700 (In reply to comment #29) > Of course, if we can add TargetType, along with other things, to cross-platform codes, then these are not necessary. I might not express myself clear, what I want to say is, if we can save the resource type and load type into the cross-platform ResourceRequest, then we don't need any new methods for BlackBerry port. And these 2 new methods are in essential doing the saving of these 2 info. 576456 31 ap 2012-03-12 13:26:06 -0700 Do you have a concrete example where resource type is needed in dispatchDecidePolicyForXXX? For example, for navigations, it's immediately clear that it's a main resource. 576473 32 liachen 2012-03-12 13:40:28 -0700 (In reply to comment #31) > Do you have a concrete example where resource type is needed in dispatchDecidePolicyForXXX? For example, for navigations, it's immediately clear that it's a main resource. Actually for main resource there is no resource type. Resource type info is for subresources. In our PlayBook API, we allow client of WebKit to filter our network request, and the TargetType of the resource request is used by client when deciding what to do with these requests. Like it can only handle some specific content (like image) as there are encrypted and let other loads go ahead as normal. So for us keeping the TargetType info accurate is required. And the TargetType info is hard to be accurate without the resource type info. These 2 methods are needed to save the resource type info. 576526 33 liachen 2012-03-12 14:27:37 -0700 (In reply to comment #31) > Do you have a concrete example where resource type is needed in dispatchDecidePolicyForXXX? For example, for navigations, it's immediately clear that it's a main resource. Hmmm, checked the code again, so all these 3 dispatchDecidePolicyForXXX (Navigation, NewWindow, Response) are for main loads. So for them, no resource type is needed. Sorry for my misunderstanding and misleading argument. But we will still need resource type for sub-resource loads to accurately decide the customization, like TargetType. 576598 34 jochen 2012-03-12 15:16:30 -0700 (In reply to comment #33) > But we will still need resource type for sub-resource loads to accurately decide the customization, like TargetType. As embedders that depend on this information will require this for lots of different locations (at least the ones using chromium's TargetType) I think instead of adding new callbacks, all loader methods that take a ResourceRequest or a FrameLoadRequest should also take a TargetType parameter, until they hit willSendRequest (TargetType could then be moved out of platform to loader and we could also drop the #ifdef PLATFORM(CHROMIUM)'s) 576821 35 liachen 2012-03-12 17:55:45 -0700 (In reply to comment #34) > I think instead of adding new callbacks, all loader methods that take a ResourceRequest or a FrameLoadRequest should also take a TargetType parameter, until they hit willSendRequest (TargetType could then be moved out of platform to loader and we could also drop the #ifdef PLATFORM(CHROMIUM)'s) Then for most sub-resource loads that are scheduled (and delayed), this info need to be saved in the ResourceLoadScheduler too. I believe an callback at the right time is simpler, and enabled different ports to do some other customization at this time. 577324 36 131617 liachen 2012-03-13 08:06:57 -0700 Created attachment 131617 Patch based on comments and fix Mac's build error. I can create a separate patch to make dispatchWillSendRequest() just a notification, and move the existing codes to the newly added methods for different platforms. 577336 37 131617 gyuyoung.kim 2012-03-13 08:24:09 -0700 Comment on attachment 131617 Patch based on comments and fix Mac's build error. Attachment 131617 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/11941582 577343 38 131621 liachen 2012-03-13 08:30:52 -0700 Created attachment 131621 Add GStreamer fix back. 577404 39 ap 2012-03-13 09:07:35 -0700 > I can create a separate patch to make dispatchWillSendRequest() just a notification, and move the existing codes to the newly added methods for different platforms. I'm not sure what you mean by this. The various willSendRequest methods are part of WebKit API. 577407 40 liachen 2012-03-13 09:10:17 -0700 (In reply to comment #39) > I'm not sure what you mean by this. The various willSendRequest methods are part of WebKit API. I mean if the new methods I suggested is approved, then willSendRequest() is redundant and should be changed to use a const ResourceRequest, which means it is just a notification callback, not for ResourceRequest customization anymore. 577420 41 jochen 2012-03-13 09:18:42 -0700 (In reply to comment #40) > (In reply to comment #39) > > I'm not sure what you mean by this. The various willSendRequest methods are part of WebKit API. > > I mean if the new methods I suggested is approved, then willSendRequest() is redundant and should be changed to use a const ResourceRequest, which means it is just a notification callback, not for ResourceRequest customization anymore. The new methods are not sufficient for the chromium port. Anyway, we need to cache the target type (or equivalently the cached resource types) already now in a few locations. I don't see that as a problem. 577427 42 liachen 2012-03-13 09:24:00 -0700 (In reply to comment #41) > > The new methods are not sufficient for the chromium port. Do you mind elaborate what extra is needed for Chromium? > Anyway, we need to cache the target type (or equivalently the cached resource types) already now in a few locations. I don't see that as a problem. Do you mean these setTargetType() calls inside these platform #ifdef? 577448 43 jochen 2012-03-13 09:47:33 -0700 (In reply to comment #42) > (In reply to comment #41) > > > > The new methods are not sufficient for the chromium port. > > Do you mind elaborate what extra is needed for Chromium? It's not clear to me how the ResourceRequest created by XMLHttpRequest will be annotated with the XHR target type using your proposed set of callbacks. > > > Anyway, we need to cache the target type (or equivalently the cached resource types) already now in a few locations. I don't see that as a problem. > > Do you mean these setTargetType() calls inside these platform #ifdef? In comment #35 you said that in order to plumb the target type everywhere, we'd need to cache it in ResourceLoadScheduler. I was referring to that comment: I don't think that's a big issue, as we do that already e.g. in CachedResource.cpp (i.e. the information what target type to use is kept in the cache so we can attach it to the resource request when we need it) 577486 44 liachen 2012-03-13 10:08:30 -0700 (In reply to comment #43) > It's not clear to me how the ResourceRequest created by XMLHttpRequest will be annotated with the XHR target type using your proposed set of callbacks. Yeah that is a problem. Do you think it make sense to call frame()->loader()->client()->customizeSubresourceRequest() in XMLHttpRequest::createRequest()? > In comment #35 you said that in order to plumb the target type everywhere, we'd need to cache it in ResourceLoadScheduler. I was referring to that comment: I don't think that's a big issue, as we do that already e.g. in CachedResource.cpp (i.e. the information what target type to use is kept in the cache so we can attach it to the resource request when we need it) So you mean it is fine for us to leave these #ifdef there? And add more when it is needed? I actually don't mind this approach that much, just thought removing these platform #ifdef and doing all these customization in BlackBerry platform will be cleaner. 577601 45 jochen 2012-03-13 11:31:01 -0700 (In reply to comment #44) > (In reply to comment #43) > > It's not clear to me how the ResourceRequest created by XMLHttpRequest will be annotated with the XHR target type using your proposed set of callbacks. > > Yeah that is a problem. Do you think it make sense to call frame()->loader()->client()->customizeSubresourceRequest() in XMLHttpRequest::createRequest()? That's not possible, as the XHR might be created on the worker thread, so we have to jump to the main thread first before we can invoke methods on the FrameLoaderClient > > > In comment #35 you said that in order to plumb the target type everywhere, we'd need to cache it in ResourceLoadScheduler. I was referring to that comment: I don't think that's a big issue, as we do that already e.g. in CachedResource.cpp (i.e. the information what target type to use is kept in the cache so we can attach it to the resource request when we need it) > > So you mean it is fine for us to leave these #ifdef there? And add more when it is needed? No, I want to get rid of the ifdefs target type should not be part of resource request Instead, all loader related methods that take a resource request should also take a target type parameter, e.g. ThreadableLoader::create should take ScriptExecutionContext, ThreadableLoaderClient, ResourceRequest, TargetType, and ThreadableLoaderOptions parameters. TargetType could either be owned by FrameLoader or some other class in loader/ > > I actually don't mind this approach that much, just thought removing these platform #ifdef and doing all these customization in BlackBerry platform will be cleaner. 577607 46 liachen 2012-03-13 11:41:05 -0700 (In reply to comment #45) > > No, I want to get rid of the ifdefs > > target type should not be part of resource request > > Instead, all loader related methods that take a resource request should also take a target type parameter, e.g. ThreadableLoader::create should take ScriptExecutionContext, ThreadableLoaderClient, ResourceRequest, TargetType, and ThreadableLoaderOptions parameters. > > TargetType could either be owned by FrameLoader or some other class in loader/ > Like your patch for https://bugs.webkit.org/show_bug.cgi?id=65855? It is unfortunately there for about 5 months now without a r+ or r-. 577884 47 jochen 2012-03-13 15:31:18 -0700 (In reply to comment #46) > (In reply to comment #45) > > > > No, I want to get rid of the ifdefs > > > > target type should not be part of resource request > > > > Instead, all loader related methods that take a resource request should also take a target type parameter, e.g. ThreadableLoader::create should take ScriptExecutionContext, ThreadableLoaderClient, ResourceRequest, TargetType, and ThreadableLoaderOptions parameters. > > > > TargetType could either be owned by FrameLoader or some other class in loader/ > > > > Like your patch for https://bugs.webkit.org/show_bug.cgi?id=65855? It is unfortunately there for about 5 months now without a r+ or r-. I take comment 23 on that bug as a r- However, the approach I took in that patch was also different from what I described above. It introduces a new class that binds a ResourceRequest and a TargetType together. What I think might be a solution (and I tried to describe above) is not introducing a new class, but just plumbing the two values everywhere we need them. 578357 48 liachen 2012-03-14 07:02:48 -0700 (In reply to comment #47) > > I take comment 23 on that bug as a r- > > However, the approach I took in that patch was also different from what I described above. It introduces a new class that binds a ResourceRequest and a TargetType together. What I think might be a solution (and I tried to describe above) is not introducing a new class, but just plumbing the two values everywhere we need them. Hi, jochen: any progress on this approach? Or any bug to track it? 578360 49 jochen 2012-03-14 07:08:44 -0700 (In reply to comment #48) > (In reply to comment #47) > > > > I take comment 23 on that bug as a r- > > > > However, the approach I took in that patch was also different from what I described above. It introduces a new class that binds a ResourceRequest and a TargetType together. What I think might be a solution (and I tried to describe above) is not introducing a new class, but just plumbing the two values everywhere we need them. > > Hi, jochen: any progress on this approach? Or any bug to track it? No, sorry. Once I have time for it, I'll attach the patch to https://bugs.webkit.org/show_bug.cgi?id=65855 578361 50 jochen 2012-03-14 07:09:56 -0700 of course, feel free to implement this yourself, or come up with an even better solution :) 578363 51 liachen 2012-03-14 07:15:09 -0700 (In reply to comment #50) > of course, feel free to implement this yourself, or come up with an even better solution :) For my current patch, do you think it will work if I use 2 thread-safe plain C function, instead of FrameLoaderClient method, so they can be safely called from any threads, including worker threads? 578467 52 jochen 2012-03-14 09:10:25 -0700 (In reply to comment #51) > (In reply to comment #50) > > of course, feel free to implement this yourself, or come up with an even better solution :) > > For my current patch, do you think it will work if I use 2 thread-safe plain C function, instead of FrameLoaderClient method, so they can be safely called from any threads, including worker threads? I think it's preferable to do all customization of ResourceRequests on the main thread. 606040 53 131621 japhet 2012-04-19 15:49:47 -0700 Comment on attachment 131621 Add GStreamer fix back. I'm inclined to agree with ap that adding these new callbacks is not the right answer, especially for the subresource case. Since we don't do policy checks for subresources, dispatchWillSendRequest() seem like the right time for them. For the policy checks for main resource, perhaps we can approximate the TargetType, especially since there should be only 2 possibilities, then just set the real TargetType in dispatchWillSendRequest() as well? 606756 54 liachen 2012-04-20 11:49:04 -0700 (In reply to comment #53) > Since we don't do policy checks for subresources, dispatchWillSendRequest() seem like the right time for them. For the policy checks for main resource, perhaps we can approximate the TargetType, especially since there should be only 2 possibilities, then just set the real TargetType in dispatchWillSendRequest() as well? Thanks for closing this bug! Even r- is better than leaving it there without a conclusion. And yes I have updated our BlackBerry code and only ensure right TargetType in dispatchWillSendRequest(), though I personally still would like making TargetType of ResourceRequest always right. 986285 55 pnormand 2014-03-03 00:23:53 -0800 Ping? Not sure this bug is still valid. 986336 56 liachen 2014-03-03 07:25:04 -0800 (In reply to comment #55) > Ping? Not sure this bug is still valid. It is no longer valid. 131066 2012-03-09 11:49:12 -0800 2012-03-12 10:30:24 -0700 Suggested patch for 80713 80713.patch text/plain 7748 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMDY0ZTAwLi5kMTIzMmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDMtMDkgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgQWRkIG5ldyBtZXRob2RzIHRvIEZyYW1lTG9hZGVyQ2xpZW50IHNvIGRpZmZlcmVudCBXZWJL aXQgcG9ydHMgY2FuIGN1c3RvbWl6ZSB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3Jl YXRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgw NzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHB1cnBvc2Ugb2YgdGhlc2UgY2hhbmdlIGlzIHRvIHByb3ZpZGUgYSBnZW5lcmljIHdheSBmb3Ig ZGlmZmVyZW50IHBsYXRmb3JtcyB0bworICAgICAgICBkbyB0aGVpciBvd24gc3BlY2lmaWMgY3Vz dG9taXphdGlvbiBvZiB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3JlYXRlZCwgbGlr ZQorICAgICAgICBzZXR0aW5nIFRhcmdldFR5cGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBu byBjaGFuZ2Ugb2YgYmVoYXZpb3VyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3VicmVz b3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyLmg6CisgICAgICAgIChGcmFtZUxvYWRlcik6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyQ2xpZW50OjphZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50OjphZGRFeHRyYUZpZWxkc1RvTWFpblJlc291 cmNlUmVxdWVzdCk6CisgICAgICAgICogbG9hZGVyL1BpbmdMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGluZ0xvYWRlcjo6bG9hZEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdM b2FkZXI6OnNlbmRQaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6OnJlcG9ydENv bnRlbnRTZWN1cml0eVBvbGljeVZpb2xhdGlvbik6CisgICAgICAgICogbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjpjcmVh dGUpOgorCiAyMDEyLTAzLTA5ICBab2x0YW4gSGVyY3plZyAgPHpoZXJjemVnQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgQWRkIFNWR1JlbmRlcmluZ0NvbnRleHQgYW5kIG1vdmUgdGhlcmUgdGhlIGNv bnRleHQgcmVsYXRlZCBjb2RlIGZyb20gU1ZHUmVuZGVyU3VwcG9ydApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKaW5kZXggNjc3NmFkNy4uZDljYjcwYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yNTMzLDE0ICsyNTMzLDE2IEBAIHZvaWQgRnJhbWVM b2FkZXI6OmRldGFjaFZpZXdzQW5kRG9jdW1lbnRMb2FkZXIoKQogICAgIG1fY2xpZW50LT5kZXRh Y2hlZEZyb21QYXJlbnQzKCk7CiB9CiAgICAgCi12b2lkIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKK3ZvaWQg RnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlKQogewogICAgIGFkZEV4 dHJhRmllbGRzVG9SZXF1ZXN0KHJlcXVlc3QsIG1fbG9hZFR5cGUsIGZhbHNlKTsKKyAgICBtX2Ns aWVudC0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRU eXBlLCB0eXBlKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb01haW5S ZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIGFkZEV4dHJh RmllbGRzVG9SZXF1ZXN0KHJlcXVlc3QsIG1fbG9hZFR5cGUsIHRydWUpOworICAgIG1fY2xpZW50 LT5hZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBl KTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb1JlcXVlc3QoUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBGcmFtZUxvYWRUeXBlIGxvYWRUeXBlLCBib29sIG1haW5SZXNv dXJjZSkKQEAgLTI2NzYsNyArMjY3OCw3IEBAIHVuc2lnbmVkIGxvbmcgRnJhbWVMb2FkZXI6Omxv YWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1CiAgICAg aWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpCiAgICAgICAgIGluaXRpYWxSZXF1ZXN0 LnNldEZpcnN0UGFydHlGb3JDb29raWVzKHBhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+ZG9j dW1lbnRMb2FkZXIoKS0+cmVxdWVzdCgpLnVybCgpKTsKICAgICAKLSAgICBhZGRFeHRyYUZpZWxk c1RvU3VicmVzb3VyY2VSZXF1ZXN0KGluaXRpYWxSZXF1ZXN0KTsKKyAgICBhZGRFeHRyYUZpZWxk c1RvU3VicmVzb3VyY2VSZXF1ZXN0KGluaXRpYWxSZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZTo6UmF3 UmVzb3VyY2UpOwogCiAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyID0gMDsgICAgCiAgICAg UmVzb3VyY2VSZXF1ZXN0IG5ld1JlcXVlc3QoaW5pdGlhbFJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuaAppbmRleCBkZjM1N2Q2Li4yODg5Y2E0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuaApAQCAtMTkyLDcgKzE5Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRl dGFjaEZyb21QYXJlbnQoKTsKICAgICB2b2lkIGRldGFjaFZpZXdzQW5kRG9jdW1lbnRMb2FkZXIo KTsKIAotICAgIHZvaWQgYWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChSZXNvdXJj ZVJlcXVlc3QmKTsKKyAgICB2b2lkIGFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3Qo UmVzb3VyY2VSZXF1ZXN0JiwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUpOwogICAgIHZvaWQgYWRkRXh0 cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgCiAg ICAgc3RhdGljIHZvaWQgYWRkSFRUUE9yaWdpbklmTmVlZGVkKFJlc291cmNlUmVxdWVzdCYsIGNv bnN0IFN0cmluZyYgb3JpZ2luKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xp ZW50LmgKaW5kZXggMjM1YzQxYy4uZDI5ODFkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyQ2xpZW50LmgKQEAgLTk5LDYgKzk5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgIGNsYXNzIFN1YnN0aXR1dGVEYXRhOwogICAgIGNsYXNzIFdpZGdldDsKIAorICAgIGVudW0g Q2FjaGVkUmVzb3VyY2U6OlR5cGU7CisKICAgICB0eXBlZGVmIHZvaWQgKFBvbGljeUNoZWNrZXI6 OipGcmFtZVBvbGljeUZ1bmN0aW9uKShQb2xpY3lBY3Rpb24pOwogCiAgICAgY2xhc3MgRnJhbWVM b2FkZXJDbGllbnQgewpAQCAtMTI2LDYgKzEyOCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog ICAgICAgICB2aXJ0dWFsIHZvaWQgYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QodW5z aWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVx dWVzdCYpID0gMDsKIAorICAgICAgICB2aXJ0dWFsIHZvaWQgYWRkRXh0cmFGaWVsZHNUb1N1YnJl c291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgbG9h ZFR5cGUsIENhY2hlZFJlc291cmNlOjpUeXBlIHJlc291cmNlVHlwZSkgeyB9OworICAgICAgICB2 aXJ0dWFsIHZvaWQgYWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBGcmFtZUxvYWRUeXBlIHR5cGUpIHsgfTsKICAgICAgICAgdmlydHVh bCB2b2lkIGRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQg bG9uZyBpZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNl JiByZWRpcmVjdFJlc3BvbnNlKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVc2VD cmVkZW50aWFsU3RvcmFnZShEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmll cikgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Bp bmdMb2FkZXIuY3BwCmluZGV4IDczMjhmNWIuLmY1OWQyMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UGluZ0xvYWRlci5jcHAKQEAgLTYzLDcgKzYzLDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpsb2FkSW1h Z2UoRnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJiB1cmwpCiAgICAgU3RyaW5nIHJlZmVycmVyID0g U2VjdXJpdHlQb2xpY3k6OmdlbmVyYXRlUmVmZXJyZXJIZWFkZXIoZnJhbWUtPmRvY3VtZW50KCkt PnJlZmVycmVyUG9saWN5KCksIHJlcXVlc3QudXJsKCksIGZyYW1lLT5sb2FkZXIoKS0+b3V0Z29p bmdSZWZlcnJlcigpKTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKICAgICAgICAgcmVx dWVzdC5zZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwotICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRk RXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBmcmFtZS0+bG9h ZGVyKCktPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgQ2FjaGVk UmVzb3VyY2U6OkltYWdlUmVzb3VyY2UpOwogICAgIE93blB0cjxQaW5nTG9hZGVyPiBwaW5nTG9h ZGVyID0gYWRvcHRQdHIobmV3IFBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpKTsKIAogICAgIC8v IExlYWsgdGhlIHBpbmcgbG9hZGVyLCBzaW5jZSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24g YXMgaXQgcmVjZWl2ZXMgYSByZXNwb25zZS4KQEAgLTgyLDcgKzgyLDcgQEAgdm9pZCBQaW5nTG9h ZGVyOjpzZW5kUGluZyhGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHBpbmdVUkwsIGNvbnN0IEtV UkwmIGRlc3RpbmEKICAgICByZXF1ZXN0LnNldEhUVFBDb250ZW50VHlwZSgidGV4dC9waW5nIik7 CiAgICAgcmVxdWVzdC5zZXRIVFRQQm9keShGb3JtRGF0YTo6Y3JlYXRlKCJQSU5HIikpOwogICAg IHJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKCJDYWNoZS1Db250cm9sIiwgIm1heC1hZ2U9MCIp OwotICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVz dChyZXF1ZXN0KTsKKyAgICBmcmFtZS0+bG9hZGVyKCktPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNv dXJjZVJlcXVlc3QocmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jlc291cmNlKTsKIAogICAg IFNlY3VyaXR5T3JpZ2luKiBzb3VyY2VPcmlnaW4gPSBmcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJp dHlPcmlnaW4oKTsKICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHBpbmdPcmlnaW4gPSBTZWN1 cml0eU9yaWdpbjo6Y3JlYXRlKHBpbmdVUkwpOwpAQCAtMTEyLDcgKzExMiw3IEBAIHZvaWQgUGlu Z0xvYWRlcjo6cmVwb3J0Q29udGVudFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uKEZyYW1lKiBmcmFt ZSwgY29uc3QgS1VSTCYKICAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QoIlBPU1QiKTsKICAgICBy ZXF1ZXN0LnNldEhUVFBDb250ZW50VHlwZSgiYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNv ZGVkIik7CiAgICAgcmVxdWVzdC5zZXRIVFRQQm9keShyZXBvcnQpOwotICAgIGZyYW1lLT5sb2Fk ZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBm cmFtZS0+bG9hZGVyKCktPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVz dCwgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jlc291cmNlKTsKIAogICAgIFN0cmluZyByZWZlcnJlciA9 IFNlY3VyaXR5UG9saWN5OjpnZW5lcmF0ZVJlZmVycmVySGVhZGVyKGZyYW1lLT5kb2N1bWVudCgp LT5yZWZlcnJlclBvbGljeSgpLCByZXBvcnRVUkwsIGZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdS ZWZlcnJlcigpKTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDc2NTgzZTguLmY3MTQ4YjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAtMTEzLDcg KzExMyw3IEBAIFBhc3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IFN1YnJlc291cmNlTG9hZGVy OjpjcmVhdGUoRnJhbWUqIGZyYW1lLCBDYWNoZWRSZXNvCiAgICAgICAgIG5ld1JlcXVlc3Quc2V0 SFRUUFJlZmVycmVyKG91dGdvaW5nUmVmZXJyZXIpOwogICAgIEZyYW1lTG9hZGVyOjphZGRIVFRQ T3JpZ2luSWZOZWVkZWQobmV3UmVxdWVzdCwgb3V0Z29pbmdPcmlnaW4pOwogCi0gICAgZnJhbWVM b2FkZXItPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QobmV3UmVxdWVzdCk7Cisg ICAgZnJhbWVMb2FkZXItPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QobmV3UmVx dWVzdCwgcmVzb3VyY2UtPnR5cGUoKSk7CiAKICAgICBSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+ IHN1YmxvYWRlcihhZG9wdFJlZihuZXcgU3VicmVzb3VyY2VMb2FkZXIoZnJhbWUsIHJlc291cmNl LCBvcHRpb25zKSkpOwogICAgIGlmICghc3VibG9hZGVyLT5pbml0KG5ld1JlcXVlc3QpKQo= 131346 2012-03-12 10:29:47 -0700 2012-03-12 11:19:29 -0700 Update patch so it compiles. 80713-2.patch text/plain 7708 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMmNmOTZjLi5lNjAxNTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTItMDMtMTIgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgQWRkIG5ldyBtZXRob2RzIHRvIEZyYW1lTG9hZGVyQ2xpZW50IHNvIGRpZmZlcmVudCBXZWJL aXQgcG9ydHMgY2FuIGN1c3RvbWl6ZSB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3Jl YXRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgw NzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHB1cnBvc2Ugb2YgdGhlc2UgY2hhbmdlIGlzIHRvIHByb3ZpZGUgYSBnZW5lcmljIHdheSBmb3Ig ZGlmZmVyZW50IHBsYXRmb3JtcyB0bworICAgICAgICBkbyB0aGVpciBvd24gc3BlY2lmaWMgY3Vz dG9taXphdGlvbiBvZiB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3JlYXRlZCwgbGlr ZQorICAgICAgICBzZXR0aW5nIFRhcmdldFR5cGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBu byBjaGFuZ2Ugb2YgYmVoYXZpb3VyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3VicmVz b3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyLmg6CisgICAgICAgIChGcmFtZUxvYWRlcik6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6YWRkRXh0 cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlckNsaWVudDo6YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QpOgorICAgICAg ICAqIGxvYWRlci9QaW5nTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6 OmxvYWRJbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpzZW5kUGluZyk6Cisg ICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpyZXBvcnRDb250ZW50U2VjdXJpdHlQb2xpY3lW aW9sYXRpb24pOgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKToKKwogMjAxMi0wMy0xMiAg Sm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAg IFtUZXhNYXBHTF0gUGl4ZWwtYWxpZ24gdGhlIHRyYW5zZm9ybSBvZiB0ZXh0dXJlcyB0aGF0IGZp dCBwaXhlbC1mb3ItcGl4ZWwgb24gdGhlIGZyYW1lIGJ1ZmZlci4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuY3BwCmluZGV4IDY3NzZhZDcuLmQ5Y2I3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjUzMywxNCArMjUzMywxNiBAQCB2b2lkIEZyYW1lTG9h ZGVyOjpkZXRhY2hWaWV3c0FuZERvY3VtZW50TG9hZGVyKCkKICAgICBtX2NsaWVudC0+ZGV0YWNo ZWRGcm9tUGFyZW50MygpOwogfQogICAgIAotdm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVs ZHNUb1N1YnJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCit2b2lkIEZy YW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSkKIHsKICAgICBhZGRFeHRy YUZpZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBlLCBmYWxzZSk7CisgICAgbV9jbGll bnQtPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgbV9sb2FkVHlw ZSwgdHlwZSk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9NYWluUmVz b3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBhZGRFeHRyYUZp ZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBlLCB0cnVlKTsKKyAgICBtX2NsaWVudC0+ YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgbV9sb2FkVHlwZSk7 CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KFJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCwgRnJhbWVMb2FkVHlwZSBsb2FkVHlwZSwgYm9vbCBtYWluUmVzb3Vy Y2UpCkBAIC0yNjc2LDcgKzI2NzgsNyBAQCB1bnNpZ25lZCBsb25nIEZyYW1lTG9hZGVyOjpsb2Fk UmVzb3VyY2VTeW5jaHJvbm91c2x5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdQogICAgIGlm IChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpKQogICAgICAgICBpbml0aWFsUmVxdWVzdC5z ZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhwYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPmRvY3Vt ZW50TG9hZGVyKCktPnJlcXVlc3QoKS51cmwoKSk7CiAgICAgCi0gICAgYWRkRXh0cmFGaWVsZHNU b1N1YnJlc291cmNlUmVxdWVzdChpbml0aWFsUmVxdWVzdCk7CisgICAgYWRkRXh0cmFGaWVsZHNU b1N1YnJlc291cmNlUmVxdWVzdChpbml0aWFsUmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jl c291cmNlKTsKIAogICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciA9IDA7ICAgIAogICAgIFJl c291cmNlUmVxdWVzdCBuZXdSZXF1ZXN0KGluaXRpYWxSZXF1ZXN0KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKaW5kZXggZGYzNTdkNi4uMjg4OWNhNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKQEAgLTE5Miw3ICsxOTIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkZXRh Y2hGcm9tUGFyZW50KCk7CiAgICAgdm9pZCBkZXRhY2hWaWV3c0FuZERvY3VtZW50TG9hZGVyKCk7 CiAKLSAgICB2b2lkIGFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VS ZXF1ZXN0Jik7CisgICAgdm9pZCBhZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJl c291cmNlUmVxdWVzdCYsIENhY2hlZFJlc291cmNlOjpUeXBlKTsKICAgICB2b2lkIGFkZEV4dHJh RmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYpOwogICAgIAogICAg IHN0YXRpYyB2b2lkIGFkZEhUVFBPcmlnaW5JZk5lZWRlZChSZXNvdXJjZVJlcXVlc3QmLCBjb25z dCBTdHJpbmcmIG9yaWdpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVu dC5oCmluZGV4IDIzNWM0MWMuLjZiMzI0MWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlckNsaWVudC5oCkBAIC0yOSw2ICsyOSw3IEBACiAjaWZuZGVmIEZyYW1lTG9hZGVyQ2xp ZW50X2gKICNkZWZpbmUgRnJhbWVMb2FkZXJDbGllbnRfaAogCisjaW5jbHVkZSAiQ2FjaGVkUmVz b3VyY2UuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlclR5cGVzLmgiCiAjaW5jbHVkZSAiSWNvblVS TC5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC0xMjYsNiArMTI3LDggQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBhc3NpZ25JZGVudGlmaWVyVG9J bml0aWFsUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiwg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JikgPSAwOwogCisgICAgICAgIHZpcnR1YWwgdm9pZCBhZGRF eHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg RnJhbWVMb2FkVHlwZSBsb2FkVHlwZSwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgcmVzb3VyY2VUeXBl KSB7IH07CisgICAgICAgIHZpcnR1YWwgdm9pZCBhZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNl UmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgdHlwZSkgeyB9 OwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsU2VuZFJlcXVlc3QoRG9jdW1lbnRM b2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYsIGNvbnN0 IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpID0gMDsKICAgICAgICAgdmlydHVh bCBib29sIHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlKERvY3VtZW50TG9hZGVyKiwgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShEb2N1bWVudExvYWRlciosIHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllciwgY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKSA9IDA7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKaW5kZXggNzMyOGY1Yi4uZjU5ZDIyMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmNwcApAQCAtNjMsNyArNjMsNyBAQCB2b2lkIFBp bmdMb2FkZXI6OmxvYWRJbWFnZShGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKICAgICBT dHJpbmcgcmVmZXJyZXIgPSBTZWN1cml0eVBvbGljeTo6Z2VuZXJhdGVSZWZlcnJlckhlYWRlcihm cmFtZS0+ZG9jdW1lbnQoKS0+cmVmZXJyZXJQb2xpY3koKSwgcmVxdWVzdC51cmwoKSwgZnJhbWUt PmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOwogICAgIGlmICghcmVmZXJyZXIuaXNFbXB0 eSgpKQogICAgICAgICByZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7Ci0gICAgZnJh bWUtPmxvYWRlcigpLT5hZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3Qp OworICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVz dChyZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZTo6SW1hZ2VSZXNvdXJjZSk7CiAgICAgT3duUHRyPFBp bmdMb2FkZXI+IHBpbmdMb2FkZXIgPSBhZG9wdFB0cihuZXcgUGluZ0xvYWRlcihmcmFtZSwgcmVx dWVzdCkpOwogCiAgICAgLy8gTGVhayB0aGUgcGluZyBsb2FkZXIsIHNpbmNlIGl0IHdpbGwga2ls bCBpdHNlbGYgYXMgc29vbiBhcyBpdCByZWNlaXZlcyBhIHJlc3BvbnNlLgpAQCAtODIsNyArODIs NyBAQCB2b2lkIFBpbmdMb2FkZXI6OnNlbmRQaW5nKEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYg cGluZ1VSTCwgY29uc3QgS1VSTCYgZGVzdGluYQogICAgIHJlcXVlc3Quc2V0SFRUUENvbnRlbnRU eXBlKCJ0ZXh0L3BpbmciKTsKICAgICByZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1EYXRhOjpjcmVh dGUoIlBJTkciKSk7CiAgICAgcmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQoIkNhY2hlLUNvbnRy b2wiLCAibWF4LWFnZT0wIik7Ci0gICAgZnJhbWUtPmxvYWRlcigpLT5hZGRFeHRyYUZpZWxkc1Rv U3VicmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpOworICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0 cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZTo6UmF3 UmVzb3VyY2UpOwogCiAgICAgU2VjdXJpdHlPcmlnaW4qIHNvdXJjZU9yaWdpbiA9IGZyYW1lLT5k b2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpOwogICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4g cGluZ09yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocGluZ1VSTCk7CkBAIC0xMTIsNyAr MTEyLDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpyZXBvcnRDb250ZW50U2VjdXJpdHlQb2xpY3lWaW9s YXRpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJgogICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhv ZCgiUE9TVCIpOwogICAgIHJlcXVlc3Quc2V0SFRUUENvbnRlbnRUeXBlKCJhcHBsaWNhdGlvbi94 LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKICAgICByZXF1ZXN0LnNldEhUVFBCb2R5KHJlcG9ydCk7 Ci0gICAgZnJhbWUtPmxvYWRlcigpLT5hZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0 KHJlcXVlc3QpOworICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291 cmNlUmVxdWVzdChyZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZTo6UmF3UmVzb3VyY2UpOwogCiAgICAg U3RyaW5nIHJlZmVycmVyID0gU2VjdXJpdHlQb2xpY3k6OmdlbmVyYXRlUmVmZXJyZXJIZWFkZXIo ZnJhbWUtPmRvY3VtZW50KCktPnJlZmVycmVyUG9saWN5KCksIHJlcG9ydFVSTCwgZnJhbWUtPmxv YWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOwogICAgIGlmICghcmVmZXJyZXIuaXNFbXB0eSgp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNzY1 ODNlOC4uZjcxNDhiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2Fk ZXIuY3BwCkBAIC0xMTMsNyArMTEzLDcgQEAgUGFzc1JlZlB0cjxTdWJyZXNvdXJjZUxvYWRlcj4g U3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShGcmFtZSogZnJhbWUsIENhY2hlZFJlc28KICAgICAg ICAgbmV3UmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIob3V0Z29pbmdSZWZlcnJlcik7CiAgICAgRnJh bWVMb2FkZXI6OmFkZEhUVFBPcmlnaW5JZk5lZWRlZChuZXdSZXF1ZXN0LCBvdXRnb2luZ09yaWdp bik7CiAKLSAgICBmcmFtZUxvYWRlci0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVz dChuZXdSZXF1ZXN0KTsKKyAgICBmcmFtZUxvYWRlci0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291 cmNlUmVxdWVzdChuZXdSZXF1ZXN0LCByZXNvdXJjZS0+dHlwZSgpKTsKIAogICAgIFJlZlB0cjxT dWJyZXNvdXJjZUxvYWRlcj4gc3VibG9hZGVyKGFkb3B0UmVmKG5ldyBTdWJyZXNvdXJjZUxvYWRl cihmcmFtZSwgcmVzb3VyY2UsIG9wdGlvbnMpKSk7CiAgICAgaWYgKCFzdWJsb2FkZXItPmluaXQo bmV3UmVxdWVzdCkpCg== 131358 2012-03-12 11:19:29 -0700 2012-03-13 08:06:57 -0700 Patch fixed GStreamer compile error. 80713-3.patch text/plain 8525 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMmNmOTZjLi4yZGFlNWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDMtMTIgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgQWRkIG5ldyBtZXRob2RzIHRvIEZyYW1lTG9hZGVyQ2xpZW50IHNvIGRpZmZlcmVudCBXZWJL aXQgcG9ydHMgY2FuIGN1c3RvbWl6ZSB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3Jl YXRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgw NzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHB1cnBvc2Ugb2YgdGhlc2UgY2hhbmdlIGlzIHRvIHByb3ZpZGUgYSBnZW5lcmljIHdheSBmb3Ig ZGlmZmVyZW50IHBsYXRmb3JtcyB0bworICAgICAgICBkbyB0aGVpciBvd24gc3BlY2lmaWMgY3Vz dG9taXphdGlvbiBvZiB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3JlYXRlZCwgbGlr ZQorICAgICAgICBzZXR0aW5nIFRhcmdldFR5cGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBu byBjaGFuZ2Ugb2YgYmVoYXZpb3VyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3VicmVz b3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyLmg6CisgICAgICAgIChGcmFtZUxvYWRlcik6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6YWRkRXh0 cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlckNsaWVudDo6YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QpOgorICAgICAg ICAqIGxvYWRlci9QaW5nTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6 OmxvYWRJbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpzZW5kUGluZyk6Cisg ICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpyZXBvcnRDb250ZW50U2VjdXJpdHlQb2xpY3lW aW9sYXRpb24pOgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKwog MjAxMi0wMy0xMiAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29t PgogCiAgICAgICAgIFtUZXhNYXBHTF0gUGl4ZWwtYWxpZ24gdGhlIHRyYW5zZm9ybSBvZiB0ZXh0 dXJlcyB0aGF0IGZpdCBwaXhlbC1mb3ItcGl4ZWwgb24gdGhlIGZyYW1lIGJ1ZmZlci4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDY3NzZhZDcuLmQ5Y2I3MGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjUzMywxNCArMjUzMywxNiBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpkZXRhY2hWaWV3c0FuZERvY3VtZW50TG9hZGVyKCkKICAgICBtX2Ns aWVudC0+ZGV0YWNoZWRGcm9tUGFyZW50MygpOwogfQogICAgIAotdm9pZCBGcmFtZUxvYWRlcjo6 YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QpCit2b2lkIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0 KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSkKIHsK ICAgICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBlLCBmYWxzZSk7 CisgICAgbV9jbGllbnQtPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVz dCwgbV9sb2FkVHlwZSwgdHlwZSk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmll bGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAg ICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBlLCB0cnVlKTsKKyAg ICBtX2NsaWVudC0+YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwg bV9sb2FkVHlwZSk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9SZXF1 ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRnJhbWVMb2FkVHlwZSBsb2FkVHlwZSwgYm9v bCBtYWluUmVzb3VyY2UpCkBAIC0yNjc2LDcgKzI2NzgsNyBAQCB1bnNpZ25lZCBsb25nIEZyYW1l TG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVxdQogICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpKQogICAgICAgICBpbml0 aWFsUmVxdWVzdC5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhwYWdlLT5tYWluRnJhbWUoKS0+bG9h ZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnJlcXVlc3QoKS51cmwoKSk7CiAgICAgCi0gICAgYWRk RXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChpbml0aWFsUmVxdWVzdCk7CisgICAgYWRk RXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChpbml0aWFsUmVxdWVzdCwgQ2FjaGVkUmVz b3VyY2U6OlJhd1Jlc291cmNlKTsKIAogICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciA9IDA7 ICAgIAogICAgIFJlc291cmNlUmVxdWVzdCBuZXdSZXF1ZXN0KGluaXRpYWxSZXF1ZXN0KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggZGYzNTdkNi4uMjg4OWNhNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAgLTE5Miw3ICsxOTIsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBkZXRhY2hGcm9tUGFyZW50KCk7CiAgICAgdm9pZCBkZXRhY2hWaWV3c0FuZERvY3Vt ZW50TG9hZGVyKCk7CiAKLSAgICB2b2lkIGFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVl c3QoUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgdm9pZCBhZGRFeHRyYUZpZWxkc1RvU3VicmVzb3Vy Y2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYsIENhY2hlZFJlc291cmNlOjpUeXBlKTsKICAgICB2 b2lkIGFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYp OwogICAgIAogICAgIHN0YXRpYyB2b2lkIGFkZEhUVFBPcmlnaW5JZk5lZWRlZChSZXNvdXJjZVJl cXVlc3QmLCBjb25zdCBTdHJpbmcmIG9yaWdpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlckNsaWVudC5oCmluZGV4IDIzNWM0MWMuLjZiMzI0MWEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCkBAIC0yOSw2ICsyOSw3IEBACiAjaWZuZGVmIEZy YW1lTG9hZGVyQ2xpZW50X2gKICNkZWZpbmUgRnJhbWVMb2FkZXJDbGllbnRfaAogCisjaW5jbHVk ZSAiQ2FjaGVkUmVzb3VyY2UuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlclR5cGVzLmgiCiAjaW5j bHVkZSAiSWNvblVSTC5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC0xMjYsNiArMTI3 LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBhc3NpZ25J ZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3Vt ZW50TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JikgPSAwOwogCisgICAgICAgIHZpcnR1 YWwgdm9pZCBhZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgRnJhbWVMb2FkVHlwZSBsb2FkVHlwZSwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUg cmVzb3VyY2VUeXBlKSB7IH07CisgICAgICAgIHZpcnR1YWwgdm9pZCBhZGRFeHRyYUZpZWxkc1Rv TWFpblJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZyYW1lTG9hZFR5 cGUgdHlwZSkgeyB9OwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsU2VuZFJlcXVl c3QoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVx dWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpID0gMDsKICAg ICAgICAgdmlydHVhbCBib29sIHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlKERvY3VtZW50TG9h ZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9p ZCBkaXNwYXRjaERpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShEb2N1bWVudExvYWRl ciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVu Z2UmKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKaW5kZXggNzMyOGY1Yi4u ZjU5ZDIyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmNwcApAQCAtNjMsNyArNjMs NyBAQCB2b2lkIFBpbmdMb2FkZXI6OmxvYWRJbWFnZShGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwm IHVybCkKICAgICBTdHJpbmcgcmVmZXJyZXIgPSBTZWN1cml0eVBvbGljeTo6Z2VuZXJhdGVSZWZl cnJlckhlYWRlcihmcmFtZS0+ZG9jdW1lbnQoKS0+cmVmZXJyZXJQb2xpY3koKSwgcmVxdWVzdC51 cmwoKSwgZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOwogICAgIGlmICghcmVm ZXJyZXIuaXNFbXB0eSgpKQogICAgICAgICByZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihyZWZlcnJl cik7Ci0gICAgZnJhbWUtPmxvYWRlcigpLT5hZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1 ZXN0KHJlcXVlc3QpOworICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJl c291cmNlUmVxdWVzdChyZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZTo6SW1hZ2VSZXNvdXJjZSk7CiAg ICAgT3duUHRyPFBpbmdMb2FkZXI+IHBpbmdMb2FkZXIgPSBhZG9wdFB0cihuZXcgUGluZ0xvYWRl cihmcmFtZSwgcmVxdWVzdCkpOwogCiAgICAgLy8gTGVhayB0aGUgcGluZyBsb2FkZXIsIHNpbmNl IGl0IHdpbGwga2lsbCBpdHNlbGYgYXMgc29vbiBhcyBpdCByZWNlaXZlcyBhIHJlc3BvbnNlLgpA QCAtODIsNyArODIsNyBAQCB2b2lkIFBpbmdMb2FkZXI6OnNlbmRQaW5nKEZyYW1lKiBmcmFtZSwg Y29uc3QgS1VSTCYgcGluZ1VSTCwgY29uc3QgS1VSTCYgZGVzdGluYQogICAgIHJlcXVlc3Quc2V0 SFRUUENvbnRlbnRUeXBlKCJ0ZXh0L3BpbmciKTsKICAgICByZXF1ZXN0LnNldEhUVFBCb2R5KEZv cm1EYXRhOjpjcmVhdGUoIlBJTkciKSk7CiAgICAgcmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQo IkNhY2hlLUNvbnRyb2wiLCAibWF4LWFnZT0wIik7Ci0gICAgZnJhbWUtPmxvYWRlcigpLT5hZGRF eHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpOworICAgIGZyYW1lLT5sb2Fk ZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0LCBDYWNoZWRS ZXNvdXJjZTo6UmF3UmVzb3VyY2UpOwogCiAgICAgU2VjdXJpdHlPcmlnaW4qIHNvdXJjZU9yaWdp biA9IGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpOwogICAgIFJlZlB0cjxTZWN1 cml0eU9yaWdpbj4gcGluZ09yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocGluZ1VSTCk7 CkBAIC0xMTIsNyArMTEyLDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpyZXBvcnRDb250ZW50U2VjdXJp dHlQb2xpY3lWaW9sYXRpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJgogICAgIHJlcXVlc3Qu c2V0SFRUUE1ldGhvZCgiUE9TVCIpOwogICAgIHJlcXVlc3Quc2V0SFRUUENvbnRlbnRUeXBlKCJh cHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKICAgICByZXF1ZXN0LnNldEhUVFBC b2R5KHJlcG9ydCk7Ci0gICAgZnJhbWUtPmxvYWRlcigpLT5hZGRFeHRyYUZpZWxkc1RvU3VicmVz b3VyY2VSZXF1ZXN0KHJlcXVlc3QpOworICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVs ZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZTo6UmF3UmVzb3Vy Y2UpOwogCiAgICAgU3RyaW5nIHJlZmVycmVyID0gU2VjdXJpdHlQb2xpY3k6OmdlbmVyYXRlUmVm ZXJyZXJIZWFkZXIoZnJhbWUtPmRvY3VtZW50KCktPnJlZmVycmVyUG9saWN5KCksIHJlcG9ydFVS TCwgZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOwogICAgIGlmICghcmVmZXJy ZXIuaXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5j cHAKaW5kZXggNzY1ODNlOC4uZjcxNDhiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3Vi cmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0xMTMsNyArMTEzLDcgQEAgUGFzc1JlZlB0cjxTdWJyZXNv dXJjZUxvYWRlcj4gU3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShGcmFtZSogZnJhbWUsIENhY2hl ZFJlc28KICAgICAgICAgbmV3UmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIob3V0Z29pbmdSZWZlcnJl cik7CiAgICAgRnJhbWVMb2FkZXI6OmFkZEhUVFBPcmlnaW5JZk5lZWRlZChuZXdSZXF1ZXN0LCBv dXRnb2luZ09yaWdpbik7CiAKLSAgICBmcmFtZUxvYWRlci0+YWRkRXh0cmFGaWVsZHNUb1N1YnJl c291cmNlUmVxdWVzdChuZXdSZXF1ZXN0KTsKKyAgICBmcmFtZUxvYWRlci0+YWRkRXh0cmFGaWVs ZHNUb1N1YnJlc291cmNlUmVxdWVzdChuZXdSZXF1ZXN0LCByZXNvdXJjZS0+dHlwZSgpKTsKIAog ICAgIFJlZlB0cjxTdWJyZXNvdXJjZUxvYWRlcj4gc3VibG9hZGVyKGFkb3B0UmVmKG5ldyBTdWJy ZXNvdXJjZUxvYWRlcihmcmFtZSwgcmVzb3VyY2UsIG9wdGlvbnMpKSk7CiAgICAgaWYgKCFzdWJs b2FkZXItPmluaXQobmV3UmVxdWVzdCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VH U3RyZWFtZXIuY3BwCmluZGV4IDJhMGFmMGMuLmIwMmMzNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFt ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9X ZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwCkBAIC00MjEsNyArNDIxLDcgQEAgc3RhdGljIGJv b2wgd2ViS2l0V2ViU3JjU3RhcnQoV2ViS2l0V2ViU3JjKiBzcmMpCiAgICAgTmV0d29ya2luZ0Nv bnRleHQqIGNvbnRleHQgPSAwOwogICAgIEZyYW1lTG9hZGVyKiBsb2FkZXIgPSBwcml2LT5mcmFt ZSA/IHByaXYtPmZyYW1lLT5sb2FkZXIoKSA6IDA7CiAgICAgaWYgKGxvYWRlcikgewotICAgICAg ICBsb2FkZXItPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCk7Cisg ICAgICAgIGxvYWRlci0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0 LCBDYWNoZWRSZXNvdXJjZTo6UmF3UmVzb3VyY2UpOwogICAgICAgICBjb250ZXh0ID0gbG9hZGVy LT5uZXR3b3JraW5nQ29udGV4dCgpOwogICAgIH0KIAo= 131617 2012-03-13 08:06:57 -0700 2012-03-13 08:30:52 -0700 Patch based on comments and fix Mac's build error. 80713-4.patch text/plain 7610 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZGYwYjVlLi4yZjAxMmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTItMDMtMTMgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgQWRkIG5ldyBtZXRob2RzIHRvIEZyYW1lTG9hZGVyQ2xpZW50IHNvIGRpZmZlcmVudCBXZWJL aXQgcG9ydHMgY2FuIGN1c3RvbWl6ZSB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3Jl YXRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgw NzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHB1cnBvc2Ugb2YgdGhlc2UgY2hhbmdlIGlzIHRvIHByb3ZpZGUgYSBnZW5lcmljIHdheSBmb3Ig ZGlmZmVyZW50IHBsYXRmb3JtcyB0bworICAgICAgICBkbyB0aGVpciBvd24gc3BlY2lmaWMgY3Vz dG9taXphdGlvbiBvZiB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3JlYXRlZCwgbGlr ZQorICAgICAgICBzZXR0aW5nIFRhcmdldFR5cGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBu byBjaGFuZ2Ugb2YgYmVoYXZpb3VyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3VicmVz b3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyLmg6CisgICAgICAgIChGcmFtZUxvYWRlcik6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6Y3VzdG9t aXplU3VicmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50OjpjdXN0b21pemVNYWluUmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvUGlu Z0xvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpsb2FkSW1hZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6UGluZ0xvYWRlcjo6c2VuZFBpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6UGluZ0xvYWRlcjo6cmVwb3J0Q29udGVudFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uKToKKyAg ICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZSk6CisKIDIwMTItMDMtMTIgIEtpbnVrbyBZYXN1ZGEg IDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpbGUgdXBsb2FkIGNvbnRyb2wgc2hv dWxkIHVzZSBGaWxlLm5hbWUoKSByYXRoZXIgdGhhbiBGaWxlLnBhdGgoKSB0byBzaG93IGNob3Nl biBmaWxlbmFtZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDY3NzZh ZDcuLmYwZjEzOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjUz MywxNCArMjUzMywxNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkZXRhY2hWaWV3c0FuZERvY3VtZW50 TG9hZGVyKCkKICAgICBtX2NsaWVudC0+ZGV0YWNoZWRGcm9tUGFyZW50MygpOwogfQogICAgIAot dm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QpCit2b2lkIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1Rv U3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgQ2FjaGVkUmVzb3Vy Y2U6OlR5cGUgdHlwZSkKIHsKICAgICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBt X2xvYWRUeXBlLCBmYWxzZSk7CisgICAgbV9jbGllbnQtPmN1c3RvbWl6ZVN1YnJlc291cmNlUmVx dWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBlLCB0eXBlKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6 YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0KQogewogICAgIGFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KHJlcXVlc3QsIG1fbG9hZFR5cGUs IHRydWUpOworICAgIG1fY2xpZW50LT5jdXN0b21pemVNYWluUmVzb3VyY2VSZXF1ZXN0KHJlcXVl c3QsIG1fbG9hZFR5cGUpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1Rv UmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgbG9hZFR5cGUs IGJvb2wgbWFpblJlc291cmNlKQpAQCAtMjY3Niw3ICsyNjc4LDcgQEAgdW5zaWduZWQgbG9uZyBG cmFtZUxvYWRlcjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseShjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXUKICAgICBpZiAoUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKSkKICAgICAgICAg aW5pdGlhbFJlcXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMocGFnZS0+bWFpbkZyYW1lKCkt PmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5yZXF1ZXN0KCkudXJsKCkpOwogICAgIAotICAg IGFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QoaW5pdGlhbFJlcXVlc3QpOworICAg IGFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QoaW5pdGlhbFJlcXVlc3QsIENhY2hl ZFJlc291cmNlOjpSYXdSZXNvdXJjZSk7CiAKICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIg PSAwOyAgICAKICAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdChpbml0aWFsUmVxdWVzdCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IGRmMzU3ZDYuLjI4ODljYTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0xOTIsNyArMTkyLDcgQEAgcHVibGlj OgogICAgIHZvaWQgZGV0YWNoRnJvbVBhcmVudCgpOwogICAgIHZvaWQgZGV0YWNoVmlld3NBbmRE b2N1bWVudExvYWRlcigpOwogCi0gICAgdm9pZCBhZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VS ZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYpOworICAgIHZvaWQgYWRkRXh0cmFGaWVsZHNUb1N1YnJl c291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmLCBDYWNoZWRSZXNvdXJjZTo6VHlwZSk7CiAg ICAgdm9pZCBhZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVl c3QmKTsKICAgICAKICAgICBzdGF0aWMgdm9pZCBhZGRIVFRQT3JpZ2luSWZOZWVkZWQoUmVzb3Vy Y2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiBvcmlnaW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAyMzVjNDFjLi5lNGY5NDI3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMjksNiArMjksNyBAQAogI2lmbmRl ZiBGcmFtZUxvYWRlckNsaWVudF9oCiAjZGVmaW5lIEZyYW1lTG9hZGVyQ2xpZW50X2gKIAorI2lu Y2x1ZGUgIkNhY2hlZFJlc291cmNlLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJUeXBlcy5oIgog I2luY2x1ZGUgIkljb25VUkwuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgpAQCAtMTI2LDYg KzEyNyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgYXNz aWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBE b2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpID0gMDsKIAorICAgICAgICB2 aXJ0dWFsIHZvaWQgY3VzdG9taXplU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYs IEZyYW1lTG9hZFR5cGUsIENhY2hlZFJlc291cmNlOjpUeXBlKSB7IH07CisgICAgICAgIHZpcnR1 YWwgdm9pZCBjdXN0b21pemVNYWluUmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYsIEZy YW1lTG9hZFR5cGUpIHsgfTsKICAgICAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoV2lsbFNlbmRS ZXF1ZXN0KERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBSZXNvdXJj ZVJlcXVlc3QmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKSA9IDA7 CiAgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZShEb2N1bWVu dExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikgPSAwOwogICAgICAgICB2aXJ0dWFs IHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoRG9jdW1lbnRM b2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlJikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2Fk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCmluZGV4IDczMjhm NWIuLmY1OWQyMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKQEAgLTYzLDcg KzYzLDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpsb2FkSW1hZ2UoRnJhbWUqIGZyYW1lLCBjb25zdCBL VVJMJiB1cmwpCiAgICAgU3RyaW5nIHJlZmVycmVyID0gU2VjdXJpdHlQb2xpY3k6OmdlbmVyYXRl UmVmZXJyZXJIZWFkZXIoZnJhbWUtPmRvY3VtZW50KCktPnJlZmVycmVyUG9saWN5KCksIHJlcXVl c3QudXJsKCksIGZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpKTsKICAgICBpZiAo IXJlZmVycmVyLmlzRW1wdHkoKSkKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocmVm ZXJyZXIpOwotICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNl UmVxdWVzdChyZXF1ZXN0KTsKKyAgICBmcmFtZS0+bG9hZGVyKCktPmFkZEV4dHJhRmllbGRzVG9T dWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2Up OwogICAgIE93blB0cjxQaW5nTG9hZGVyPiBwaW5nTG9hZGVyID0gYWRvcHRQdHIobmV3IFBpbmdM b2FkZXIoZnJhbWUsIHJlcXVlc3QpKTsKIAogICAgIC8vIExlYWsgdGhlIHBpbmcgbG9hZGVyLCBz aW5jZSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2ZXMgYSByZXNwb25z ZS4KQEAgLTgyLDcgKzgyLDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpzZW5kUGluZyhGcmFtZSogZnJh bWUsIGNvbnN0IEtVUkwmIHBpbmdVUkwsIGNvbnN0IEtVUkwmIGRlc3RpbmEKICAgICByZXF1ZXN0 LnNldEhUVFBDb250ZW50VHlwZSgidGV4dC9waW5nIik7CiAgICAgcmVxdWVzdC5zZXRIVFRQQm9k eShGb3JtRGF0YTo6Y3JlYXRlKCJQSU5HIikpOwogICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZp ZWxkKCJDYWNoZS1Db250cm9sIiwgIm1heC1hZ2U9MCIpOwotICAgIGZyYW1lLT5sb2FkZXIoKS0+ YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBmcmFtZS0+ bG9hZGVyKCktPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgQ2Fj aGVkUmVzb3VyY2U6OlJhd1Jlc291cmNlKTsKIAogICAgIFNlY3VyaXR5T3JpZ2luKiBzb3VyY2VP cmlnaW4gPSBmcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKTsKICAgICBSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+IHBpbmdPcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHBpbmdV UkwpOwpAQCAtMTEyLDcgKzExMiw3IEBAIHZvaWQgUGluZ0xvYWRlcjo6cmVwb3J0Q29udGVudFNl Y3VyaXR5UG9saWN5VmlvbGF0aW9uKEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYKICAgICByZXF1 ZXN0LnNldEhUVFBNZXRob2QoIlBPU1QiKTsKICAgICByZXF1ZXN0LnNldEhUVFBDb250ZW50VHlw ZSgiYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkIik7CiAgICAgcmVxdWVzdC5zZXRI VFRQQm9keShyZXBvcnQpOwotICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1 YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBmcmFtZS0+bG9hZGVyKCktPmFkZEV4dHJh RmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jl c291cmNlKTsKIAogICAgIFN0cmluZyByZWZlcnJlciA9IFNlY3VyaXR5UG9saWN5OjpnZW5lcmF0 ZVJlZmVycmVySGVhZGVyKGZyYW1lLT5kb2N1bWVudCgpLT5yZWZlcnJlclBvbGljeSgpLCByZXBv cnRVUkwsIGZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpKTsKICAgICBpZiAoIXJl ZmVycmVyLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJy ZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2Fk ZXIuY3BwCmluZGV4IDc2NTgzZTguLmY3MTQ4YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAtMTEzLDcgKzExMyw3IEBAIFBhc3NSZWZQdHI8U3Vi cmVzb3VyY2VMb2FkZXI+IFN1YnJlc291cmNlTG9hZGVyOjpjcmVhdGUoRnJhbWUqIGZyYW1lLCBD YWNoZWRSZXNvCiAgICAgICAgIG5ld1JlcXVlc3Quc2V0SFRUUFJlZmVycmVyKG91dGdvaW5nUmVm ZXJyZXIpOwogICAgIEZyYW1lTG9hZGVyOjphZGRIVFRQT3JpZ2luSWZOZWVkZWQobmV3UmVxdWVz dCwgb3V0Z29pbmdPcmlnaW4pOwogCi0gICAgZnJhbWVMb2FkZXItPmFkZEV4dHJhRmllbGRzVG9T dWJyZXNvdXJjZVJlcXVlc3QobmV3UmVxdWVzdCk7CisgICAgZnJhbWVMb2FkZXItPmFkZEV4dHJh RmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QobmV3UmVxdWVzdCwgcmVzb3VyY2UtPnR5cGUoKSk7 CiAKICAgICBSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IHN1YmxvYWRlcihhZG9wdFJlZihuZXcg U3VicmVzb3VyY2VMb2FkZXIoZnJhbWUsIHJlc291cmNlLCBvcHRpb25zKSkpOwogICAgIGlmICgh c3VibG9hZGVyLT5pbml0KG5ld1JlcXVlc3QpKQo= 131621 2012-03-13 08:30:52 -0700 2012-04-19 15:49:47 -0700 Add GStreamer fix back. 80713-5.patch text/plain 8427 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZGYwYjVlLi5jMzllYTVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDMtMTMgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgQWRkIG5ldyBtZXRob2RzIHRvIEZyYW1lTG9hZGVyQ2xpZW50IHNvIGRpZmZlcmVudCBXZWJL aXQgcG9ydHMgY2FuIGN1c3RvbWl6ZSB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3Jl YXRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgw NzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHB1cnBvc2Ugb2YgdGhlc2UgY2hhbmdlIGlzIHRvIHByb3ZpZGUgYSBnZW5lcmljIHdheSBmb3Ig ZGlmZmVyZW50IHBsYXRmb3JtcyB0bworICAgICAgICBkbyB0aGVpciBvd24gc3BlY2lmaWMgY3Vz dG9taXphdGlvbiBvZiB0aGUgUmVzb3VyY2VSZXF1ZXN0IHdoZW4gaXQgaXMgY3JlYXRlZCwgbGlr ZQorICAgICAgICBzZXR0aW5nIFRhcmdldFR5cGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBu byBjaGFuZ2Ugb2YgYmVoYXZpb3VyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3VicmVz b3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyLmg6CisgICAgICAgIChGcmFtZUxvYWRlcik6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6Y3VzdG9t aXplU3VicmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50OjpjdXN0b21pemVNYWluUmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvUGlu Z0xvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpsb2FkSW1hZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6UGluZ0xvYWRlcjo6c2VuZFBpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6UGluZ0xvYWRlcjo6cmVwb3J0Q29udGVudFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uKToKKyAg ICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHA6CisKIDIwMTItMDMtMTIgIEtp bnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpbGUgdXBsb2Fk IGNvbnRyb2wgc2hvdWxkIHVzZSBGaWxlLm5hbWUoKSByYXRoZXIgdGhhbiBGaWxlLnBhdGgoKSB0 byBzaG93IGNob3NlbiBmaWxlbmFtZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IDY3NzZhZDcuLmYwZjEzOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcApAQCAtMjUzMywxNCArMjUzMywxNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkZXRhY2hWaWV3 c0FuZERvY3VtZW50TG9hZGVyKCkKICAgICBtX2NsaWVudC0+ZGV0YWNoZWRGcm9tUGFyZW50Mygp OwogfQogICAgIAotdm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNl UmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCit2b2lkIEZyYW1lTG9hZGVyOjphZGRF eHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg Q2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSkKIHsKICAgICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVz dChyZXF1ZXN0LCBtX2xvYWRUeXBlLCBmYWxzZSk7CisgICAgbV9jbGllbnQtPmN1c3RvbWl6ZVN1 YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBlLCB0eXBlKTsKIH0KIAogdm9pZCBG cmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIGFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KHJlcXVlc3Qs IG1fbG9hZFR5cGUsIHRydWUpOworICAgIG1fY2xpZW50LT5jdXN0b21pemVNYWluUmVzb3VyY2VS ZXF1ZXN0KHJlcXVlc3QsIG1fbG9hZFR5cGUpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjphZGRF eHRyYUZpZWxkc1RvUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZyYW1lTG9hZFR5 cGUgbG9hZFR5cGUsIGJvb2wgbWFpblJlc291cmNlKQpAQCAtMjY3Niw3ICsyNjc4LDcgQEAgdW5z aWduZWQgbG9uZyBGcmFtZUxvYWRlcjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseShjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXUKICAgICBpZiAoUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2Uo KSkKICAgICAgICAgaW5pdGlhbFJlcXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMocGFnZS0+ bWFpbkZyYW1lKCktPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5yZXF1ZXN0KCkudXJsKCkp OwogICAgIAotICAgIGFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QoaW5pdGlhbFJl cXVlc3QpOworICAgIGFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QoaW5pdGlhbFJl cXVlc3QsIENhY2hlZFJlc291cmNlOjpSYXdSZXNvdXJjZSk7CiAKICAgICB1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIgPSAwOyAgICAKICAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdChpbml0 aWFsUmVxdWVzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IGRmMzU3ZDYu LjI4ODljYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0xOTIsNyArMTky LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGV0YWNoRnJvbVBhcmVudCgpOwogICAgIHZvaWQgZGV0 YWNoVmlld3NBbmREb2N1bWVudExvYWRlcigpOwogCi0gICAgdm9pZCBhZGRFeHRyYUZpZWxkc1Rv U3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYpOworICAgIHZvaWQgYWRkRXh0cmFG aWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmLCBDYWNoZWRSZXNvdXJj ZTo6VHlwZSk7CiAgICAgdm9pZCBhZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChS ZXNvdXJjZVJlcXVlc3QmKTsKICAgICAKICAgICBzdGF0aWMgdm9pZCBhZGRIVFRQT3JpZ2luSWZO ZWVkZWQoUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiBvcmlnaW4pOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAyMzVjNDFjLi5lNGY5NDI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMjksNiArMjks NyBAQAogI2lmbmRlZiBGcmFtZUxvYWRlckNsaWVudF9oCiAjZGVmaW5lIEZyYW1lTG9hZGVyQ2xp ZW50X2gKIAorI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2Fk ZXJUeXBlcy5oIgogI2luY2x1ZGUgIkljb25VUkwuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5o PgpAQCAtMTI2LDYgKzEyNyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2aXJ0 dWFsIHZvaWQgYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QodW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpID0gMDsK IAorICAgICAgICB2aXJ0dWFsIHZvaWQgY3VzdG9taXplU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291 cmNlUmVxdWVzdCYsIEZyYW1lTG9hZFR5cGUsIENhY2hlZFJlc291cmNlOjpUeXBlKSB7IH07Cisg ICAgICAgIHZpcnR1YWwgdm9pZCBjdXN0b21pemVNYWluUmVzb3VyY2VSZXF1ZXN0KFJlc291cmNl UmVxdWVzdCYsIEZyYW1lTG9hZFR5cGUpIHsgfTsKICAgICAgICAgdmlydHVhbCB2b2lkIGRpc3Bh dGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJl c3BvbnNlKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVc2VDcmVkZW50aWFsU3Rv cmFnZShEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikgPSAwOwogICAg ICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVu Z2UoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IEF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlJikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1BpbmdMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3Bw CmluZGV4IDczMjhmNWIuLmY1OWQyMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9QaW5nTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5j cHAKQEAgLTYzLDcgKzYzLDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpsb2FkSW1hZ2UoRnJhbWUqIGZy YW1lLCBjb25zdCBLVVJMJiB1cmwpCiAgICAgU3RyaW5nIHJlZmVycmVyID0gU2VjdXJpdHlQb2xp Y3k6OmdlbmVyYXRlUmVmZXJyZXJIZWFkZXIoZnJhbWUtPmRvY3VtZW50KCktPnJlZmVycmVyUG9s aWN5KCksIHJlcXVlc3QudXJsKCksIGZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigp KTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQ UmVmZXJyZXIocmVmZXJyZXIpOwotICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNU b1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBmcmFtZS0+bG9hZGVyKCktPmFkZEV4 dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6Oklt YWdlUmVzb3VyY2UpOwogICAgIE93blB0cjxQaW5nTG9hZGVyPiBwaW5nTG9hZGVyID0gYWRvcHRQ dHIobmV3IFBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpKTsKIAogICAgIC8vIExlYWsgdGhlIHBp bmcgbG9hZGVyLCBzaW5jZSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2 ZXMgYSByZXNwb25zZS4KQEAgLTgyLDcgKzgyLDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpzZW5kUGlu ZyhGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHBpbmdVUkwsIGNvbnN0IEtVUkwmIGRlc3RpbmEK ICAgICByZXF1ZXN0LnNldEhUVFBDb250ZW50VHlwZSgidGV4dC9waW5nIik7CiAgICAgcmVxdWVz dC5zZXRIVFRQQm9keShGb3JtRGF0YTo6Y3JlYXRlKCJQSU5HIikpOwogICAgIHJlcXVlc3Quc2V0 SFRUUEhlYWRlckZpZWxkKCJDYWNoZS1Db250cm9sIiwgIm1heC1hZ2U9MCIpOwotICAgIGZyYW1l LT5sb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsK KyAgICBmcmFtZS0+bG9hZGVyKCktPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3Qo cmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jlc291cmNlKTsKIAogICAgIFNlY3VyaXR5T3Jp Z2luKiBzb3VyY2VPcmlnaW4gPSBmcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKTsK ICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHBpbmdPcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6 Y3JlYXRlKHBpbmdVUkwpOwpAQCAtMTEyLDcgKzExMiw3IEBAIHZvaWQgUGluZ0xvYWRlcjo6cmVw b3J0Q29udGVudFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uKEZyYW1lKiBmcmFtZSwgY29uc3QgS1VS TCYKICAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QoIlBPU1QiKTsKICAgICByZXF1ZXN0LnNldEhU VFBDb250ZW50VHlwZSgiYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkIik7CiAgICAg cmVxdWVzdC5zZXRIVFRQQm9keShyZXBvcnQpOwotICAgIGZyYW1lLT5sb2FkZXIoKS0+YWRkRXh0 cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBmcmFtZS0+bG9hZGVy KCktPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgQ2FjaGVkUmVz b3VyY2U6OlJhd1Jlc291cmNlKTsKIAogICAgIFN0cmluZyByZWZlcnJlciA9IFNlY3VyaXR5UG9s aWN5OjpnZW5lcmF0ZVJlZmVycmVySGVhZGVyKGZyYW1lLT5kb2N1bWVudCgpLT5yZWZlcnJlclBv bGljeSgpLCByZXBvcnRVUkwsIGZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpKTsK ICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3Vi cmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDc2NTgzZTguLmY3MTQ4YjggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAtMTEzLDcgKzExMyw3IEBAIFBh c3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IFN1YnJlc291cmNlTG9hZGVyOjpjcmVhdGUoRnJh bWUqIGZyYW1lLCBDYWNoZWRSZXNvCiAgICAgICAgIG5ld1JlcXVlc3Quc2V0SFRUUFJlZmVycmVy KG91dGdvaW5nUmVmZXJyZXIpOwogICAgIEZyYW1lTG9hZGVyOjphZGRIVFRQT3JpZ2luSWZOZWVk ZWQobmV3UmVxdWVzdCwgb3V0Z29pbmdPcmlnaW4pOwogCi0gICAgZnJhbWVMb2FkZXItPmFkZEV4 dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QobmV3UmVxdWVzdCk7CisgICAgZnJhbWVMb2Fk ZXItPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QobmV3UmVxdWVzdCwgcmVzb3Vy Y2UtPnR5cGUoKSk7CiAKICAgICBSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IHN1YmxvYWRlcihh ZG9wdFJlZihuZXcgU3VicmVzb3VyY2VMb2FkZXIoZnJhbWUsIHJlc291cmNlLCBvcHRpb25zKSkp OwogICAgIGlmICghc3VibG9hZGVyLT5pbml0KG5ld1JlcXVlc3QpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdT dHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv V2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCAyYTBhZjBjLi5iMDJjMzYxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApAQCAtNDIxLDcgKzQy MSw3IEBAIHN0YXRpYyBib29sIHdlYktpdFdlYlNyY1N0YXJ0KFdlYktpdFdlYlNyYyogc3JjKQog ICAgIE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0ID0gMDsKICAgICBGcmFtZUxvYWRlciogbG9h ZGVyID0gcHJpdi0+ZnJhbWUgPyBwcml2LT5mcmFtZS0+bG9hZGVyKCkgOiAwOwogICAgIGlmIChs b2FkZXIpIHsKLSAgICAgICAgbG9hZGVyLT5hZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1 ZXN0KHJlcXVlc3QpOworICAgICAgICBsb2FkZXItPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJj ZVJlcXVlc3QocmVxdWVzdCwgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jlc291cmNlKTsKICAgICAgICAg Y29udGV4dCA9IGxvYWRlci0+bmV0d29ya2luZ0NvbnRleHQoKTsKICAgICB9CiAK