35773 2010-03-04 17:11:55 -0800 [chromium] add logging of cross-frame property accesses for site isolation 2013-04-09 16:09:41 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED WONTFIX P2 Normal --- 1 johnnyg johnnyg abarth commit-queue creis dglazkov fishd pfeldman sam webkit.review.bot oldest_to_newest 196276 0 johnnyg 2010-03-04 17:11:55 -0800 chromium would like to measure how often pages request properties from frames from other origins. 196279 1 50067 johnnyg 2010-03-04 17:21:33 -0800 Created attachment 50067 patch to pass accesses through chromiumbridge 196281 2 50068 johnnyg 2010-03-04 17:25:33 -0800 Created attachment 50068 same patch without debug print 196577 3 creis 2010-03-05 12:21:01 -0800 A little context: knowing whether many pages access cross-origin frames will help us decide about some potential changes to improve site isolation in Chromium. 198241 4 webkit.review.bot 2010-03-10 11:31:14 -0800 Attachment 50068 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] WebCore/bindings/v8/V8Utilities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] WebCore/bindings/v8/V8Utilities.cpp:152: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 3 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 198316 5 50068 abarth 2010-03-10 13:45:00 -0800 Comment on attachment 50068 same patch without debug print Please fix the stylebot's nits. Also you'll need to remove the following line before we can actually commit your patch: + No new tests. (OOPS!) (It's ok not to have tests for this patch because it doesn't change any functionality.) 198411 6 50454 johnnyg 2010-03-10 16:30:32 -0800 Created attachment 50454 patch with style updates style nits fixed, except header ordering which I believe is a false-positive. 198415 7 webkit.review.bot 2010-03-10 16:34:19 -0800 Attachment 50454 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/V8Utilities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 198422 8 50454 abarth 2010-03-10 16:56:51 -0800 Comment on attachment 50454 patch with style updates LGTM. I think the header ordering issue is cased by the #include <v8.h>, which we can probably just remove. 199948 9 50454 johnnyg 2010-03-15 19:00:02 -0700 Comment on attachment 50454 patch with style updates this will break chromium 200530 10 50856 johnnyg 2010-03-16 17:25:29 -0700 Created attachment 50856 patch with event id new version which also passes an ID for the current event when there is a cross-site access, so we can track when a page makes repeated accesses during a single event. 200531 11 webkit.review.bot 2010-03-16 17:26:06 -0700 Attachment 50856 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/V8Utilities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 200537 12 webkit.review.bot 2010-03-16 17:37:13 -0700 Attachment 50856 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/916019 200831 13 50916 johnnyg 2010-03-17 09:53:21 -0700 Created attachment 50916 corrected patch 200832 14 webkit.review.bot 2010-03-17 09:57:18 -0700 Attachment 50916 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/V8Utilities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 202403 15 50916 fishd 2010-03-21 23:07:46 -0700 Comment on attachment 50916 corrected patch > Index: WebKit/chromium/public/WebFrameClient.h ... > + // Notifies that a cross-frame access was made. > + virtual void didMakeCrossFrameAccess(WebFrame*, bool crossOrigin, const WebString& property, unsigned long long) { } > Index: WebKit/chromium/src/ChromiumBridge.cpp ... > +void ChromiumBridge::recordCrossFrameAccess(Frame* frame, bool crossOrigin, const String& name, unsigned long long eventId) > +{ > + WebFrameImpl* frameImpl = WebFrameImpl::fromFrame(frame); > + frameImpl->client()->didMakeCrossFrameAccess(frameImpl, crossOrigin, name, eventId); > +} > + If it belongs on WebFrameClient, then it also belongs on FrameLoaderClient. Also, we should avoid dumping things into ChromiumBridge that are not purely the domain of WebCore/platform. The easy test: is the method parameterized by a Frame? If so, then it should actually be on FrameLoaderClient. 203294 16 51468 johnnyg 2010-03-23 17:13:25 -0700 Created attachment 51468 patch using FrameLoaderClient submitting new patch which uses FrameLoaderClient and does not use ChromiumBridge 203295 17 webkit.review.bot 2010-03-23 17:16:21 -0700 Attachment 51468 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/V8Utilities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 203343 18 51468 fishd 2010-03-24 00:04:47 -0700 Comment on attachment 51468 patch using FrameLoaderClient ndex: WebCore/bindings/v8/V8Utilities.cpp ... > +void logSiteIsolationAccess(v8::Local<v8::String> name, const v8::AccessorInfo& info) > +{ > + Frame* target = V8DOMWindow::toNative(info.Holder())->frame(); > + Frame* active = V8BindingState::Only()->getActiveWindow()->frame(); > + if (target == active) > + return; > + > + bool crossSite = !V8BindingSecurity::canAccessFrame(V8BindingState::Only(), target, false); > + String propName = toWebCoreString(name); > + > + // For cross-site, we also want to identify the current event to record repeat accesses. It would be helpful if this comment explained why we want to do this for cross-site only. What happens if this code is reached from within an isolated world? > + unsigned long long eventId = 0; > + if (crossSite) { > + v8::HandleScope handleScope; > + v8::Handle<v8::Context> v8Context = V8Proxy::mainWorldContext(active); > + if (!v8Context.IsEmpty()) { > + v8::Context::Scope scope(v8Context); > + v8::Handle<v8::Object> global = v8Context->Global(); > + v8::Handle<v8::Value> jsEvent = global->Get(v8::String::NewSymbol("event")); > + if (V8DOMWrapper::isValidDOMObject(jsEvent)) > + eventId = (unsigned long long) V8Event::toNative(v8::Handle<v8::Object>::Cast(jsEvent)); > + } > + } > + active->loader()->client()->didMakeCrossFrameAccess(crossSite, propName, eventId); > +} it might be nice to make these function names, logSiteIsolationAccess and didMakeCrossFrameAccess, be related. also, isn't this code running *before* the cross frame access? probably that "did" should be a "will"? could it be useful to pass the target frame as a parameter to didMakeCrossFrameAccess? then, the embedder could gather additional information from the target frame if needed. maybe that is not useful? > Index: WebKit/chromium/public/WebFrameClient.h ... > + // Notifies that a cross-frame access was made. > + virtual void didMakeCrossFrameAccess(WebFrame*, bool crossOrigin, const WebString& property, unsigned long long) { } nit: please name the 'unsigned long long' argument. nit: the comment is redundant with the method name, so it should probably be eliminated. 203434 19 johnnyg 2010-03-24 09:01:29 -0700 (In reply to comment #18) > (From update of attachment 51468 [details]) > ndex: WebCore/bindings/v8/V8Utilities.cpp > ... > > +void logSiteIsolationAccess(v8::Local<v8::String> name, const v8::AccessorInfo& info) > > +{ > > + Frame* target = V8DOMWindow::toNative(info.Holder())->frame(); > > + Frame* active = V8BindingState::Only()->getActiveWindow()->frame(); > > + if (target == active) > > + return; > > + > > + bool crossSite = !V8BindingSecurity::canAccessFrame(V8BindingState::Only(), target, false); > > + String propName = toWebCoreString(name); > > + > > + // For cross-site, we also want to identify the current event to record repeat accesses. > > It would be helpful if this comment explained why we want to do this for > cross-site only. > Adding more context. > What happens if this code is reached from within an isolated world? I'm not exactly sure what is different in an isolated world, but the code above is the same code that runs to do the actual access check; and the code below should just produce a 0 eventId if the mainWorldContext is empty. > > > + unsigned long long eventId = 0; > > + if (crossSite) { > > + v8::HandleScope handleScope; > > + v8::Handle<v8::Context> v8Context = V8Proxy::mainWorldContext(active); > > + if (!v8Context.IsEmpty()) { > > + v8::Context::Scope scope(v8Context); > > + v8::Handle<v8::Object> global = v8Context->Global(); > > + v8::Handle<v8::Value> jsEvent = global->Get(v8::String::NewSymbol("event")); > > + if (V8DOMWrapper::isValidDOMObject(jsEvent)) > > + eventId = (unsigned long long) V8Event::toNative(v8::Handle<v8::Object>::Cast(jsEvent)); > > + } > > + } > > + active->loader()->client()->didMakeCrossFrameAccess(crossSite, propName, eventId); > > +} > > it might be nice to make these function names, logSiteIsolationAccess and > didMakeCrossFrameAccess, be related. also, isn't this code running *before* > the cross frame access? probably that "did" should be a "will"? logSiteIsolationAccess is called before we know that it's cross frame (you'll see this code just returns if it turns out to be the same frame). I can change it to logAccessToCrossFrameProperty, I guess that is still accurate and more related. I would argue the code is running *during* the access and that 'did' is okay, but I'll change it if you feel strongly. > could it be useful to pass the target frame as a parameter to > didMakeCrossFrameAccess? then, the embedder could gather additional > information from the target frame if needed. maybe that is not useful? Charlie Reis, any opinion? > > > Index: WebKit/chromium/public/WebFrameClient.h > ... > > + // Notifies that a cross-frame access was made. > > + virtual void didMakeCrossFrameAccess(WebFrame*, bool crossOrigin, const WebString& property, unsigned long long) { } > > nit: please name the 'unsigned long long' argument. > nit: the comment is redundant with the method name, so it should probably be > eliminated. done on #1; all the methods in that file have comments, so instead of removing it i'll make it more informative. 203460 20 creis 2010-03-24 10:17:13 -0700 > > could it be useful to pass the target frame as a parameter to > > didMakeCrossFrameAccess? then, the embedder could gather additional > > information from the target frame if needed. maybe that is not useful? > > Charlie Reis, any opinion? That's not a bad idea. It'll unfortunately require an update to the Chromium side, but it would allow us to eventually check whether an event that makes multiple cross-site frame accesses is doing it on the same frame or different frames. 203583 21 50454 eric 2010-03-24 14:30:20 -0700 Comment on attachment 50454 patch with style updates Cleared Adam Barth's review+ from obsolete attachment 50454 so that this bug does not appear in http://webkit.org/pending-commit. 203772 22 fishd 2010-03-24 21:13:06 -0700 > > it might be nice to make these function names, logSiteIsolationAccess and > > didMakeCrossFrameAccess, be related. also, isn't this code running *before* > > the cross frame access? probably that "did" should be a "will"? > > logSiteIsolationAccess is called before we know that it's cross frame (you'll > see this code just returns if it turns out to be the same frame). I can change > it to logAccessToCrossFrameProperty, I guess that is still accurate and more > related. > > I would argue the code is running *during* the access and that 'did' is okay, > but I'll change it if you feel strongly. True. How about logPropertyAccess and logCrossFramePropertyAccess? The logSiteIsolationAccess name is a little awkward as well since it is not about access to "site-isolation" that you are logging. 206107 23 52067 johnnyg 2010-03-30 12:19:39 -0700 Created attachment 52067 patch with renames and Frame parameter 206110 24 webkit.review.bot 2010-03-30 12:22:41 -0700 Attachment 52067 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/V8Utilities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 206151 25 52067 fishd 2010-03-30 13:30:51 -0700 Comment on attachment 52067 patch with renames and Frame parameter > Index: WebCore/bindings/v8/V8Utilities.cpp ... > +void logPropertyAccess(v8::Local<v8::String> name, const v8::AccessorInfo& info) ... > + eventId = (unsigned long long) V8Event::toNative(v8::Handle<v8::Object>::Cast(jsEvent)); ^^^ shouldn't that be a reinterpret_cast? > Index: WebKit/chromium/public/WebFrameClient.h > =================================================================== > --- WebKit/chromium/public/WebFrameClient.h (revision 56799) > +++ WebKit/chromium/public/WebFrameClient.h (working copy) > @@ -284,6 +284,9 @@ public: > // scripts. > virtual void didCreateIsolatedScriptContext(WebFrame*) { } > > + // Notifies that a cross-frame access was made. > + virtual void didMakeCrossFrameAccess(WebFrame* active, WebFrame* target, bool crossOrigin, const WebString& property, unsigned long long eventId) { } Any reason not to name this the same as the FrameLoaderClient method? Unless there is a good reason, I think it would be better to make them match. 206177 26 52079 johnnyg 2010-03-30 14:14:33 -0700 Created attachment 52079 patch with rename and reinterpret_cast 206182 27 webkit.review.bot 2010-03-30 14:19:08 -0700 Attachment 52079 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/V8Utilities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 206192 28 52079 fishd 2010-03-30 14:46:35 -0700 Comment on attachment 52079 patch with rename and reinterpret_cast R=me, but cq- since there is some style issue. 206197 29 johnnyg 2010-03-30 15:05:14 -0700 the style issue is a non-issue (see comments 6-8), unless that would cause the commit queue to not commit it? 206224 30 52079 fishd 2010-03-30 15:49:21 -0700 Comment on attachment 52079 patch with rename and reinterpret_cast OK. sorry, i missed the earlier discussion! 206411 31 52079 commit-queue 2010-03-31 01:37:20 -0700 Comment on attachment 52079 patch with rename and reinterpret_cast Clearing flags on attachment: 52079 Committed r56829: <http://trac.webkit.org/changeset/56829> 206412 32 commit-queue 2010-03-31 01:37:26 -0700 All reviewed patches have been landed. Closing bug. 206560 33 pfeldman 2010-03-31 10:03:48 -0700 Rolled out in http://trac.webkit.org/changeset/56849 due to inspector tests breakage. 872134 34 schenney 2013-04-09 16:09:41 -0700 LayoutTest failures for Chromium are being marked WontFix. The Bug is still accessible and referenced from TestExpectations. 50067 2010-03-04 17:21:33 -0800 2010-03-04 17:25:33 -0800 patch to pass accesses through chromiumbridge site_isolation.patch text/plain 7681 johnnyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTU2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMtMDQgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3NlcyBmb3Ig c2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzczCisKKyAgICAgICAgQWRkIHRyYWNraW5nIG9mIGFjY2VzcyB0byBwcm9wZXJ0 aWVzIG1hcmtlZCBbRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5XS4KKwkKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JWOC5wbToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFV0aWxpdGllcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpsb2dTaXRlSXNvbGF0aW9uQWNjZXNzKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9WOFV0aWxpdGllcy5oOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJp ZGdlLmg6CisKIDIwMTAtMDMtMDQgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JWOC5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCShyZXZpc2lvbiA1NTU2MykKKysrIFdlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0JKHdvcmtpbmcgY29weSkKQEAgLTcxMCw2 ICs3MTAsMTEgQEAgRU5ECiAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgaWYg KCFWOEJpbmRpbmdTZWN1cml0eTo6Y2hlY2tOb2RlU2VjdXJpdHkoVjhCaW5kaW5nU3RhdGU6Ok9u bHkoKSwgaW1wLT4kYXR0ck5hbWUoKSkpIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTtc blxuIik7CiAgICAgfSBlbHNpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJp YnV0ZXMtPnsiQ2hlY2tGcmFtZVNlY3VyaXR5In0pIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRl bnREZWNscywgIiAgICBpZiAoIVY4QmluZGluZ1NlY3VyaXR5OjpjaGVja05vZGVTZWN1cml0eShW OEJpbmRpbmdTdGF0ZTo6T25seSgpLCBpbXAtPmNvbnRlbnREb2N1bWVudCgpKSkgcmV0dXJuIHY4 OjpIYW5kbGU8djg6OlZhbHVlPigpO1xuXG4iKTsKKyAgICB9IAorCisgICAgaWYgKCRhdHRyRXh0 LT57IkRvTm90Q2hlY2tEb21haW5TZWN1cml0eSJ9IHx8IAorICAgICAgICAkYXR0ckV4dC0+eyJE b05vdENoZWNrRG9tYWluU2VjdXJpdHlPbkdldCJ9KSB7CisgICAgICAgIHB1c2goQGltcGxDb250 ZW50RGVjbHMsICIgICAgbG9nU2l0ZUlzb2xhdGlvbkFjY2VzcyhuYW1lLCBpbmZvKTtcbiIpOwog ICAgIH0KIAogICAgIG15ICR1c2VFeGNlcHRpb25zID0gMSBpZiBAeyRhdHRyaWJ1dGUtPmdldHRl ckV4Y2VwdGlvbnN9IGFuZCAhKCRpc1BvZFR5cGUpOwpAQCAtMTUwNiw2ICsxNTExLDcgQEAgc3Vi IEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICIjaW5jbHVkZSBcIlY4QmluZGluZy5o XCJcbiIgLgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhCaW5kaW5nU3RhdGUuaFwiXG4iIC4KICAg ICAgICAgICIjaW5jbHVkZSBcIlY4RE9NV3JhcHBlci5oXCJcbiIgLgorICAgICAgICAgIiNpbmNs dWRlIFwiVjhVdGlsaXRpZXMuaFwiXG4iIC4KICAgICAgICAgICIjaW5jbHVkZSBcIlY4SXNvbGF0 ZWRDb250ZXh0LmhcIlxuXG4iIC4KICAgICAgICAgICIjdW5kZWYgTE9HXG5cbiIpOwogCkluZGV4 OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkocmV2aXNpb24gNTU1NjMpCisrKyBXZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsMTEg KzMzLDE0IEBACiAKICNpbmNsdWRlIDx2OC5oPgogCisjaW5jbHVkZSAiQ2hyb21pdW1CcmlkZ2Uu aCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAi U2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIgogI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAjaW5j bHVkZSAiVjhCaW5kaW5nLmgiCisjaW5jbHVkZSAiVjhCaW5kaW5nU3RhdGUuaCIKKyNpbmNsdWRl ICJWOERPTVdpbmRvdy5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKICNpbmNsdWRlICJXb3JrZXJD b250ZXh0LmgiCiAjaW5jbHVkZSAiV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmgiCkBAIC0x NDYsNiArMTQ5LDE4IEBAIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGdldFNjcmlwdEV4ZWN1dGkK ICAgICByZXR1cm4gMDsKIH0KIAordm9pZCBsb2dTaXRlSXNvbGF0aW9uQWNjZXNzKHY4OjpMb2Nh bDx2ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKSB7CisgICAg RnJhbWUqIHRhcmdldCA9IFY4RE9NV2luZG93Ojp0b05hdGl2ZShpbmZvLkhvbGRlcigpKS0+ZnJh bWUoKTsKKyAgICBGcmFtZSogYWN0aXZlID0gVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKS0+Z2V0QWN0 aXZlV2luZG93KCktPmZyYW1lKCk7CisgICAgaWYgKHRhcmdldCA9PSBhY3RpdmUpCisgICAgICAg IHJldHVybjsKKworICAgIGJvb2wgY3Jvc3NTaXRlID0gIVY4QmluZGluZ1NlY3VyaXR5OjpjYW5B Y2Nlc3NGcmFtZShWOEJpbmRpbmdTdGF0ZTo6T25seSgpLCB0YXJnZXQsIGZhbHNlKTsKKyAgICBT dHJpbmcgc3RhdE5hbWUgPSB0b1dlYkNvcmVTdHJpbmcobmFtZSk7CisgICAgcHJpbnRmKCIrKyVz IChjcm9zcy1zaXRlOiAlZClcbiIsIHN0YXROYW1lLnV0ZjgoKS5kYXRhKCksIGNyb3NzU2l0ZSk7 CisgICAgQ2hyb21pdW1CcmlkZ2U6OnJlY29yZENyb3NzRnJhbWVBY2Nlc3MoYWN0aXZlLCBjcm9z c1NpdGUsIHN0YXROYW1lKTsKK30KKwogdm9pZCByZXBvcnRFeGNlcHRpb24oU2NyaXB0U3RhdGUq IHNjcmlwdFN0YXRlLCB2ODo6VHJ5Q2F0Y2gmIGV4Y2VwdGlvbkNhdGNoZXIpCiB7CiAgICAgU3Ry aW5nIGVycm9yTWVzc2FnZTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmgJKHJldmlz aW9uIDU1NTYzKQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5oCSh3b3JraW5n IGNvcHkpCkBAIC02MSw2ICs2MSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIHZvaWQg cmVwb3J0RXhjZXB0aW9uKFNjcmlwdFN0YXRlKiwgdjg6OlRyeUNhdGNoJik7CiAKKyAgICB2b2lk IGxvZ1NpdGVJc29sYXRpb25BY2Nlc3Modjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0 IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pOworCiAgICAgY2xhc3MgQWxsb3dBbGxvY2F0aW9uIHsK ICAgICBwdWJsaWM6CiAgICAgICAgIGlubGluZSBBbGxvd0FsbG9jYXRpb24oKQpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAkocmV2aXNpb24gNTU1NjMp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE4NSw2ICsxODUsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0 YXRpYyB2b2lkIHNldFNoYXJlZFRpbWVyRmlyZVRpbWUoZG91YmxlIGZpcmVUaW1lKTsKICAgICAg ICAgc3RhdGljIHZvaWQgc3RvcFNoYXJlZFRpbWVyKCk7CiAKKyAgICAgICAgLy8gU2l0ZSBJc29s YXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KKyAgICAgICAgc3RhdGljIHZvaWQgcmVjb3JkQ3Jvc3NGcmFtZUFjY2VzcyhGcmFtZSosIGJv b2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFN0cmluZyYgcHJvcGVydHkpOworCiAgICAgICAgIC8vIFN0 YXRzQ291bnRlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAgICAgICAgIHN0YXRpYyB2b2lkIGRlY3JlbWVudFN0YXRzQ291bnRlcihjb25z dCBjaGFyKiBuYW1lKTsKICAgICAgICAgc3RhdGljIHZvaWQgaW5jcmVtZW50U3RhdHNDb3VudGVy KGNvbnN0IGNoYXIqIG5hbWUpOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NTU2MykKKysr IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBA QAorMjAxMC0wMy0wNCAgSm9obiBHcmVnZyAgPGpvaG5ueWdAZ29vZ2xlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGFkZCBs b2dnaW5nIG9mIGNyb3NzLWZyYW1lIHByb3BlcnR5IGFjY2Vzc2VzIGZvciBzaXRlIGlzb2xhdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3NzMK KworICAgICAgICBBZGQgY2FsbHMgb3V0IHRvIHRoZSBXZWJGcmFtZUNsaWVudCB3aGVuZXZlciBh IHBhZ2UgYWNjZXNzZXMgYSBwcm9wZXJ0eSBvZiAKKyAgICAgICAgYSBmcmFtZSB3aGljaCB3YXMg bWFya2VkIFtEb05vdENoZWNrRG9tYWluU2VjdXJpdHldLgorCisgICAgICAgICogcHVibGljL1dl YkZyYW1lQ2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50OjpkaWRNYWtl Q3Jvc3NGcmFtZUFjY2Vzcyk6CisgICAgICAgICogcHVibGljL1dlYktpdENsaWVudC5oOgorICAg ICAgICAoV2ViS2l0OjpXZWJLaXRDbGllbnQ6OnJlY29yZENyb3NzRnJhbWVBY2Nlc3MpOgorICAg ICAgICAqIHNyYy9DaHJvbWl1bUJyaWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1 bUJyaWRnZTo6cmVjb3JkQ3Jvc3NGcmFtZUFjY2Vzcyk6CisKIDIwMTAtMDMtMDQgIERhcmluIEZp c2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEbWl0cnkg VGl0b3YuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCShyZXZp c2lvbiA1NTU2MykKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAko d29ya2luZyBjb3B5KQpAQCAtMjc0LDYgKzI3NCw5IEBAIHB1YmxpYzoKICAgICAvLyBzY3JpcHRz LgogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVJc29sYXRlZFNjcmlwdENvbnRleHQoV2ViRnJh bWUqKSB7IH0KIAorICAgIC8vIE5vdGlmaWVzIHRoYXQgYSBjcm9zcy1mcmFtZSBhY2Nlc3Mgd2Fz IG1hZGUuCisgICAgdmlydHVhbCB2b2lkIGRpZE1ha2VDcm9zc0ZyYW1lQWNjZXNzKFdlYkZyYW1l KiwgYm9vbCBjcm9zc09yaWdpbiwgY29uc3QgV2ViU3RyaW5nJiBwcm9wZXJ0eSkgeyB9CisKIAog ICAgIC8vIEdlb21ldHJ5IG5vdGlmaWNhdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYktp dENsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViS2l0Q2xp ZW50LmgJKHJldmlzaW9uIDU1NTYzKQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJLaXRD bGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjQxLDYgKzI0MSwxMCBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIFdlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnkqIHNoYXJlZFdvcmtlclJlcG9zaXRv cnkoKSB7IHJldHVybiAwOyB9CiAKKyAgICAvLyBTaXRlIElzb2xhdGlvbiAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworICAgIHZpcnR1YWwg dm9pZCByZWNvcmRDcm9zc0ZyYW1lQWNjZXNzKGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFdlYlN0 cmluZyYgbmFtZSkgeyB9CisKICAgICAvLyBTdWRkZW4gVGVybWluYXRpb24gLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogICAgIC8vIERpc2FibGUv RW5hYmxlIHN1ZGRlbiB0ZXJtaW5hdGlvbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hy b21pdW1CcmlkZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21p dW1CcmlkZ2UuY3BwCShyZXZpc2lvbiA1NTU2MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hy b21pdW1CcmlkZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MDYsNiArNTA2LDE0IEBAIHZvaWQg Q2hyb21pdW1CcmlkZ2U6OnN0b3BTaGFyZWRUaW1lcigpCiAgICAgd2ViS2l0Q2xpZW50KCktPnN0 b3BTaGFyZWRUaW1lcigpOwogfQogCisvLyBTaXRlSXNvbGF0aW9uIC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKK3ZvaWQgQ2hy b21pdW1CcmlkZ2U6OnJlY29yZENyb3NzRnJhbWVBY2Nlc3MoRnJhbWUqIGZyYW1lLCBib29sIGNy b3NzT3JpZ2luLCBjb25zdCBTdHJpbmcmIG5hbWUpCit7CisgICAgV2ViRnJhbWVJbXBsKiBmcmFt ZUltcGwgPSBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShmcmFtZSk7CisgICAgZnJhbWVJbXBsLT5j bGllbnQoKS0+ZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3MoZnJhbWVJbXBsLCBjcm9zc09yaWdpbiwg bmFtZSk7Cit9CisKIC8vIFN0YXRzQ291bnRlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogdm9pZCBDaHJvbWl1bUJyaWRn ZTo6ZGVjcmVtZW50U3RhdHNDb3VudGVyKGNvbnN0IGNoYXIqIG5hbWUpCg== 50068 2010-03-04 17:25:33 -0800 2010-03-10 16:30:32 -0800 same patch without debug print site_isolation.patch text/plain 7573 johnnyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTU2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMtMDQgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3NlcyBmb3Ig c2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzczCisKKyAgICAgICAgQWRkIHRyYWNraW5nIG9mIGFjY2VzcyB0byBwcm9wZXJ0 aWVzIG1hcmtlZCBbRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5XS4KKwkKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JWOC5wbToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFV0aWxpdGllcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpsb2dTaXRlSXNvbGF0aW9uQWNjZXNzKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9WOFV0aWxpdGllcy5oOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJp ZGdlLmg6CisKIDIwMTAtMDMtMDQgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JWOC5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCShyZXZpc2lvbiA1NTU2MykKKysrIFdlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0JKHdvcmtpbmcgY29weSkKQEAgLTcxMCw2 ICs3MTAsMTEgQEAgRU5ECiAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgaWYg KCFWOEJpbmRpbmdTZWN1cml0eTo6Y2hlY2tOb2RlU2VjdXJpdHkoVjhCaW5kaW5nU3RhdGU6Ok9u bHkoKSwgaW1wLT4kYXR0ck5hbWUoKSkpIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTtc blxuIik7CiAgICAgfSBlbHNpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJp YnV0ZXMtPnsiQ2hlY2tGcmFtZVNlY3VyaXR5In0pIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRl bnREZWNscywgIiAgICBpZiAoIVY4QmluZGluZ1NlY3VyaXR5OjpjaGVja05vZGVTZWN1cml0eShW OEJpbmRpbmdTdGF0ZTo6T25seSgpLCBpbXAtPmNvbnRlbnREb2N1bWVudCgpKSkgcmV0dXJuIHY4 OjpIYW5kbGU8djg6OlZhbHVlPigpO1xuXG4iKTsKKyAgICB9IAorCisgICAgaWYgKCRhdHRyRXh0 LT57IkRvTm90Q2hlY2tEb21haW5TZWN1cml0eSJ9IHx8IAorICAgICAgICAkYXR0ckV4dC0+eyJE b05vdENoZWNrRG9tYWluU2VjdXJpdHlPbkdldCJ9KSB7CisgICAgICAgIHB1c2goQGltcGxDb250 ZW50RGVjbHMsICIgICAgbG9nU2l0ZUlzb2xhdGlvbkFjY2VzcyhuYW1lLCBpbmZvKTtcbiIpOwog ICAgIH0KIAogICAgIG15ICR1c2VFeGNlcHRpb25zID0gMSBpZiBAeyRhdHRyaWJ1dGUtPmdldHRl ckV4Y2VwdGlvbnN9IGFuZCAhKCRpc1BvZFR5cGUpOwpAQCAtMTUwNiw2ICsxNTExLDcgQEAgc3Vi IEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICIjaW5jbHVkZSBcIlY4QmluZGluZy5o XCJcbiIgLgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhCaW5kaW5nU3RhdGUuaFwiXG4iIC4KICAg ICAgICAgICIjaW5jbHVkZSBcIlY4RE9NV3JhcHBlci5oXCJcbiIgLgorICAgICAgICAgIiNpbmNs dWRlIFwiVjhVdGlsaXRpZXMuaFwiXG4iIC4KICAgICAgICAgICIjaW5jbHVkZSBcIlY4SXNvbGF0 ZWRDb250ZXh0LmhcIlxuXG4iIC4KICAgICAgICAgICIjdW5kZWYgTE9HXG5cbiIpOwogCkluZGV4 OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkocmV2aXNpb24gNTU1NjMpCisrKyBXZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsMTEg KzMzLDE0IEBACiAKICNpbmNsdWRlIDx2OC5oPgogCisjaW5jbHVkZSAiQ2hyb21pdW1CcmlkZ2Uu aCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAi U2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIgogI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAjaW5j bHVkZSAiVjhCaW5kaW5nLmgiCisjaW5jbHVkZSAiVjhCaW5kaW5nU3RhdGUuaCIKKyNpbmNsdWRl ICJWOERPTVdpbmRvdy5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKICNpbmNsdWRlICJXb3JrZXJD b250ZXh0LmgiCiAjaW5jbHVkZSAiV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmgiCkBAIC0x NDYsNiArMTQ5LDE2IEBAIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGdldFNjcmlwdEV4ZWN1dGkK ICAgICByZXR1cm4gMDsKIH0KIAordm9pZCBsb2dTaXRlSXNvbGF0aW9uQWNjZXNzKHY4OjpMb2Nh bDx2ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKSB7CisgICAg RnJhbWUqIHRhcmdldCA9IFY4RE9NV2luZG93Ojp0b05hdGl2ZShpbmZvLkhvbGRlcigpKS0+ZnJh bWUoKTsKKyAgICBGcmFtZSogYWN0aXZlID0gVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKS0+Z2V0QWN0 aXZlV2luZG93KCktPmZyYW1lKCk7CisgICAgaWYgKHRhcmdldCA9PSBhY3RpdmUpCisgICAgICAg IHJldHVybjsKKworICAgIGJvb2wgY3Jvc3NTaXRlID0gIVY4QmluZGluZ1NlY3VyaXR5OjpjYW5B Y2Nlc3NGcmFtZShWOEJpbmRpbmdTdGF0ZTo6T25seSgpLCB0YXJnZXQsIGZhbHNlKTsKKyAgICBD aHJvbWl1bUJyaWRnZTo6cmVjb3JkQ3Jvc3NGcmFtZUFjY2VzcyhhY3RpdmUsIGNyb3NzU2l0ZSwg dG9XZWJDb3JlU3RyaW5nKG5hbWUpKTsKK30KKwogdm9pZCByZXBvcnRFeGNlcHRpb24oU2NyaXB0 U3RhdGUqIHNjcmlwdFN0YXRlLCB2ODo6VHJ5Q2F0Y2gmIGV4Y2VwdGlvbkNhdGNoZXIpCiB7CiAg ICAgU3RyaW5nIGVycm9yTWVzc2FnZTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGls aXRpZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmgJ KHJldmlzaW9uIDU1NTYzKQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5oCSh3 b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAg IHZvaWQgcmVwb3J0RXhjZXB0aW9uKFNjcmlwdFN0YXRlKiwgdjg6OlRyeUNhdGNoJik7CiAKKyAg ICB2b2lkIGxvZ1NpdGVJc29sYXRpb25BY2Nlc3Modjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUs IGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pOworCiAgICAgY2xhc3MgQWxsb3dBbGxvY2F0 aW9uIHsKICAgICBwdWJsaWM6CiAgICAgICAgIGlubGluZSBBbGxvd0FsbG9jYXRpb24oKQpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAkocmV2aXNpb24g NTU1NjMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgJKHdv cmtpbmcgY29weSkKQEAgLTE4NSw2ICsxODUsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHN0YXRpYyB2b2lkIHNldFNoYXJlZFRpbWVyRmlyZVRpbWUoZG91YmxlIGZpcmVUaW1lKTsK ICAgICAgICAgc3RhdGljIHZvaWQgc3RvcFNoYXJlZFRpbWVyKCk7CiAKKyAgICAgICAgLy8gU2l0 ZSBJc29sYXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KKyAgICAgICAgc3RhdGljIHZvaWQgcmVjb3JkQ3Jvc3NGcmFtZUFjY2VzcyhGcmFt ZSosIGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFN0cmluZyYgcHJvcGVydHkpOworCiAgICAgICAg IC8vIFN0YXRzQ291bnRlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAgICAgICAgIHN0YXRpYyB2b2lkIGRlY3JlbWVudFN0YXRzQ291bnRl cihjb25zdCBjaGFyKiBuYW1lKTsKICAgICAgICAgc3RhdGljIHZvaWQgaW5jcmVtZW50U3RhdHND b3VudGVyKGNvbnN0IGNoYXIqIG5hbWUpOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NTU2 MykKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwyMCBAQAorMjAxMC0wMy0wNCAgSm9obiBHcmVnZyAgPGpvaG5ueWdAZ29vZ2xlLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1d IGFkZCBsb2dnaW5nIG9mIGNyb3NzLWZyYW1lIHByb3BlcnR5IGFjY2Vzc2VzIGZvciBzaXRlIGlz b2xhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzU3NzMKKworICAgICAgICBBZGQgY2FsbHMgb3V0IHRvIHRoZSBXZWJGcmFtZUNsaWVudCB3aGVu ZXZlciBhIHBhZ2UgYWNjZXNzZXMgYSBwcm9wZXJ0eSBvZiAKKyAgICAgICAgYSBmcmFtZSB3aGlj aCB3YXMgbWFya2VkIFtEb05vdENoZWNrRG9tYWluU2VjdXJpdHldLgorCisgICAgICAgICogcHVi bGljL1dlYkZyYW1lQ2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50Ojpk aWRNYWtlQ3Jvc3NGcmFtZUFjY2Vzcyk6CisgICAgICAgICogcHVibGljL1dlYktpdENsaWVudC5o OgorICAgICAgICAoV2ViS2l0OjpXZWJLaXRDbGllbnQ6OnJlY29yZENyb3NzRnJhbWVBY2Nlc3Mp OgorICAgICAgICAqIHNyYy9DaHJvbWl1bUJyaWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD aHJvbWl1bUJyaWRnZTo6cmVjb3JkQ3Jvc3NGcmFtZUFjY2Vzcyk6CisKIDIwMTAtMDMtMDQgIERh cmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBE bWl0cnkgVGl0b3YuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5o CShyZXZpc2lvbiA1NTU2MykKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjc0LDYgKzI3NCw5IEBAIHB1YmxpYzoKICAgICAvLyBz Y3JpcHRzLgogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVJc29sYXRlZFNjcmlwdENvbnRleHQo V2ViRnJhbWUqKSB7IH0KIAorICAgIC8vIE5vdGlmaWVzIHRoYXQgYSBjcm9zcy1mcmFtZSBhY2Nl c3Mgd2FzIG1hZGUuCisgICAgdmlydHVhbCB2b2lkIGRpZE1ha2VDcm9zc0ZyYW1lQWNjZXNzKFdl YkZyYW1lKiwgYm9vbCBjcm9zc09yaWdpbiwgY29uc3QgV2ViU3RyaW5nJiBwcm9wZXJ0eSkgeyB9 CisKIAogICAgIC8vIEdlb21ldHJ5IG5vdGlmaWNhdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYktpdENsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi S2l0Q2xpZW50LmgJKHJldmlzaW9uIDU1NTYzKQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJLaXRDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjQxLDYgKzI0MSwxMCBAQCBwdWJsaWM6 CiAKICAgICB2aXJ0dWFsIFdlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnkqIHNoYXJlZFdvcmtlclJl cG9zaXRvcnkoKSB7IHJldHVybiAwOyB9CiAKKyAgICAvLyBTaXRlIElzb2xhdGlvbiAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworICAgIHZp cnR1YWwgdm9pZCByZWNvcmRDcm9zc0ZyYW1lQWNjZXNzKGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0 IFdlYlN0cmluZyYgbmFtZSkgeyB9CisKICAgICAvLyBTdWRkZW4gVGVybWluYXRpb24gLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogICAgIC8vIERp c2FibGUvRW5hYmxlIHN1ZGRlbiB0ZXJtaW5hdGlvbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9z cmMvQ2hyb21pdW1CcmlkZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMv Q2hyb21pdW1CcmlkZ2UuY3BwCShyZXZpc2lvbiA1NTU2MykKKysrIFdlYktpdC9jaHJvbWl1bS9z cmMvQ2hyb21pdW1CcmlkZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MDYsNiArNTA2LDE0IEBA IHZvaWQgQ2hyb21pdW1CcmlkZ2U6OnN0b3BTaGFyZWRUaW1lcigpCiAgICAgd2ViS2l0Q2xpZW50 KCktPnN0b3BTaGFyZWRUaW1lcigpOwogfQogCisvLyBTaXRlSXNvbGF0aW9uIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKK3Zv aWQgQ2hyb21pdW1CcmlkZ2U6OnJlY29yZENyb3NzRnJhbWVBY2Nlc3MoRnJhbWUqIGZyYW1lLCBi b29sIGNyb3NzT3JpZ2luLCBjb25zdCBTdHJpbmcmIG5hbWUpCit7CisgICAgV2ViRnJhbWVJbXBs KiBmcmFtZUltcGwgPSBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShmcmFtZSk7CisgICAgZnJhbWVJ bXBsLT5jbGllbnQoKS0+ZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3MoZnJhbWVJbXBsLCBjcm9zc09y aWdpbiwgbmFtZSk7Cit9CisKIC8vIFN0YXRzQ291bnRlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogdm9pZCBDaHJvbWl1 bUJyaWRnZTo6ZGVjcmVtZW50U3RhdHNDb3VudGVyKGNvbnN0IGNoYXIqIG5hbWUpCg== 50454 2010-03-10 16:30:32 -0800 2010-03-24 14:30:20 -0700 patch with style updates bug35773c.diff text/plain 7597 johnnyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTU2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMtMDQgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3NlcyBmb3Ig c2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzczCisKKyAgICAgICAgQWRkIHRyYWNraW5nIG9mIGFjY2VzcyB0byBwcm9wZXJ0 aWVzIG1hcmtlZCBbRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5XS4KKworICAgICAgICBObyBuZXcg dGVzdHMgYmVjYXVzZSBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZS4KKworICAgICAgICAqIGJpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4 VXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvZ1NpdGVJc29sYXRpb25BY2Nlc3Mp OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmg6CisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaDoKKwogMjAxMC0wMy0wNCAgTWFyayBSb3dlICA8 bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4 OiBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0JKHJldmlzaW9u IDU1NTYzKQorKysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQko d29ya2luZyBjb3B5KQpAQCAtNzEwLDYgKzcxMCwxMSBAQCBFTkQKICAgICAgICAgcHVzaChAaW1w bENvbnRlbnREZWNscywgIiAgICBpZiAoIVY4QmluZGluZ1NlY3VyaXR5OjpjaGVja05vZGVTZWN1 cml0eShWOEJpbmRpbmdTdGF0ZTo6T25seSgpLCBpbXAtPiRhdHRyTmFtZSgpKSkgcmV0dXJuIHY4 OjpIYW5kbGU8djg6OlZhbHVlPigpO1xuXG4iKTsKICAgICB9IGVsc2lmICgkYXR0cmlidXRlLT5z aWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDaGVja0ZyYW1lU2VjdXJpdHkifSkgewog ICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIGlmICghVjhCaW5kaW5nU2VjdXJp dHk6OmNoZWNrTm9kZVNlY3VyaXR5KFY4QmluZGluZ1N0YXRlOjpPbmx5KCksIGltcC0+Y29udGVu dERvY3VtZW50KCkpKSByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7XG5cbiIpOworICAg IH0gCisKKyAgICBpZiAoJGF0dHJFeHQtPnsiRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5In0gfHwg CisgICAgICAgICRhdHRyRXh0LT57IkRvTm90Q2hlY2tEb21haW5TZWN1cml0eU9uR2V0In0pIHsK KyAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBsb2dTaXRlSXNvbGF0aW9uQWNj ZXNzKG5hbWUsIGluZm8pO1xuIik7CiAgICAgfQogCiAgICAgbXkgJHVzZUV4Y2VwdGlvbnMgPSAx IGlmIEB7JGF0dHJpYnV0ZS0+Z2V0dGVyRXhjZXB0aW9uc30gYW5kICEoJGlzUG9kVHlwZSk7CkBA IC0xNTA2LDYgKzE1MTEsNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAg IiNpbmNsdWRlIFwiVjhCaW5kaW5nLmhcIlxuIiAuCiAgICAgICAgICAiI2luY2x1ZGUgXCJWOEJp bmRpbmdTdGF0ZS5oXCJcbiIgLgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhET01XcmFwcGVyLmhc IlxuIiAuCisgICAgICAgICAiI2luY2x1ZGUgXCJWOFV0aWxpdGllcy5oXCJcbiIgLgogICAgICAg ICAgIiNpbmNsdWRlIFwiVjhJc29sYXRlZENvbnRleHQuaFwiXG5cbiIgLgogICAgICAgICAgIiN1 bmRlZiBMT0dcblxuIik7CiAKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwCShy ZXZpc2lvbiA1NTU2MykKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zMywxMSArMzMsMTQgQEAKIAogI2luY2x1ZGUgPHY4Lmg+CiAKKyNp bmNsdWRlICJDaHJvbWl1bUJyaWRnZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVk ZSAiRnJhbWUuaCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCiAjaW5jbHVk ZSAiU2NyaXB0U3RhdGUuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKKyNpbmNsdWRlICJWOEJp bmRpbmdTdGF0ZS5oIgorI2luY2x1ZGUgIlY4RE9NV2luZG93LmgiCiAjaW5jbHVkZSAiVjhQcm94 eS5oIgogI2luY2x1ZGUgIldvcmtlckNvbnRleHQuaCIKICNpbmNsdWRlICJXb3JrZXJDb250ZXh0 RXhlY3V0aW9uUHJveHkuaCIKQEAgLTE0Niw2ICsxNDksMTcgQEAgU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCogZ2V0U2NyaXB0RXhlY3V0aQogICAgIHJldHVybiAwOwogfQogCit2b2lkIGxvZ1NpdGVJ c29sYXRpb25BY2Nlc3Modjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nl c3NvckluZm8mIGluZm8pCit7CisgICAgRnJhbWUqIHRhcmdldCA9IFY4RE9NV2luZG93Ojp0b05h dGl2ZShpbmZvLkhvbGRlcigpKS0+ZnJhbWUoKTsKKyAgICBGcmFtZSogYWN0aXZlID0gVjhCaW5k aW5nU3RhdGU6Ok9ubHkoKS0+Z2V0QWN0aXZlV2luZG93KCktPmZyYW1lKCk7CisgICAgaWYgKHRh cmdldCA9PSBhY3RpdmUpCisgICAgICAgIHJldHVybjsKKworICAgIGJvb2wgY3Jvc3NTaXRlID0g IVY4QmluZGluZ1NlY3VyaXR5OjpjYW5BY2Nlc3NGcmFtZShWOEJpbmRpbmdTdGF0ZTo6T25seSgp LCB0YXJnZXQsIGZhbHNlKTsKKyAgICBDaHJvbWl1bUJyaWRnZTo6cmVjb3JkQ3Jvc3NGcmFtZUFj Y2VzcyhhY3RpdmUsIGNyb3NzU2l0ZSwgdG9XZWJDb3JlU3RyaW5nKG5hbWUpKTsKK30KKwogdm9p ZCByZXBvcnRFeGNlcHRpb24oU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlLCB2ODo6VHJ5Q2F0Y2gm IGV4Y2VwdGlvbkNhdGNoZXIpCiB7CiAgICAgU3RyaW5nIGVycm9yTWVzc2FnZTsKSW5kZXg6IFdl YkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmgJKHJldmlzaW9uIDU1NTYzKQorKysgV2ViQ29yZS9iaW5k aW5ncy92OC9WOFV0aWxpdGllcy5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw4IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIHZvaWQgcmVwb3J0RXhjZXB0aW9uKFNjcmlwdFN0YXRl Kiwgdjg6OlRyeUNhdGNoJik7CiAKKyAgICB2b2lkIGxvZ1NpdGVJc29sYXRpb25BY2Nlc3Modjg6 OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pOwor CiAgICAgY2xhc3MgQWxsb3dBbGxvY2F0aW9uIHsKICAgICBwdWJsaWM6CiAgICAgICAgIGlubGlu ZSBBbGxvd0FsbG9jYXRpb24oKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJv bWl1bUJyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hy b21pdW1CcmlkZ2UuaAkocmV2aXNpb24gNTU1NjMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL0Nocm9taXVtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4NSw2ICsxODUsOSBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyB2b2lkIHNldFNoYXJlZFRpbWVyRmly ZVRpbWUoZG91YmxlIGZpcmVUaW1lKTsKICAgICAgICAgc3RhdGljIHZvaWQgc3RvcFNoYXJlZFRp bWVyKCk7CiAKKyAgICAgICAgLy8gU2l0ZSBJc29sYXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgc3RhdGljIHZvaWQgcmVj b3JkQ3Jvc3NGcmFtZUFjY2VzcyhGcmFtZSosIGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFN0cmlu ZyYgcHJvcGVydHkpOworCiAgICAgICAgIC8vIFN0YXRzQ291bnRlcnMgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgIHN0YXRpYyB2 b2lkIGRlY3JlbWVudFN0YXRzQ291bnRlcihjb25zdCBjaGFyKiBuYW1lKTsKICAgICAgICAgc3Rh dGljIHZvaWQgaW5jcmVtZW50U3RhdHNDb3VudGVyKGNvbnN0IGNoYXIqIG5hbWUpOwpJbmRleDog V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCShyZXZpc2lvbiA1NTU2MykKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wMy0wNCAgSm9obiBHcmVnZyAg PGpvaG5ueWdAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbY2hyb21pdW1dIGFkZCBsb2dnaW5nIG9mIGNyb3NzLWZyYW1lIHByb3Bl cnR5IGFjY2Vzc2VzIGZvciBzaXRlIGlzb2xhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3NzMKKworICAgICAgICBBZGQgY2FsbHMgb3V0IHRv IHRoZSBXZWJGcmFtZUNsaWVudCB3aGVuZXZlciBhIHBhZ2UgYWNjZXNzZXMgYSBwcm9wZXJ0eSBv ZiAKKyAgICAgICAgYSBmcmFtZSB3aGljaCB3YXMgbWFya2VkIFtEb05vdENoZWNrRG9tYWluU2Vj dXJpdHldLgorCisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50Lmg6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lQ2xpZW50OjpkaWRNYWtlQ3Jvc3NGcmFtZUFjY2Vzcyk6CisgICAgICAg ICogcHVibGljL1dlYktpdENsaWVudC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJLaXRDbGllbnQ6 OnJlY29yZENyb3NzRnJhbWVBY2Nlc3MpOgorICAgICAgICAqIHNyYy9DaHJvbWl1bUJyaWRnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bUJyaWRnZTo6cmVjb3JkQ3Jvc3NGcmFtZUFj Y2Vzcyk6CisKIDIwMTAtMDMtMDQgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBEbWl0cnkgVGl0b3YuCkluZGV4OiBXZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCShyZXZpc2lvbiA1NTU2MykKKysrIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjc0LDYgKzI3 NCw5IEBAIHB1YmxpYzoKICAgICAvLyBzY3JpcHRzLgogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVh dGVJc29sYXRlZFNjcmlwdENvbnRleHQoV2ViRnJhbWUqKSB7IH0KIAorICAgIC8vIE5vdGlmaWVz IHRoYXQgYSBjcm9zcy1mcmFtZSBhY2Nlc3Mgd2FzIG1hZGUuCisgICAgdmlydHVhbCB2b2lkIGRp ZE1ha2VDcm9zc0ZyYW1lQWNjZXNzKFdlYkZyYW1lKiwgYm9vbCBjcm9zc09yaWdpbiwgY29uc3Qg V2ViU3RyaW5nJiBwcm9wZXJ0eSkgeyB9CisKIAogICAgIC8vIEdlb21ldHJ5IG5vdGlmaWNhdGlv bnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYktpdENsaWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViS2l0Q2xpZW50LmgJKHJldmlzaW9uIDU1NTYzKQorKysg V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJLaXRDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAt MjQxLDYgKzI0MSwxMCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFdlYlNoYXJlZFdvcmtlclJl cG9zaXRvcnkqIHNoYXJlZFdvcmtlclJlcG9zaXRvcnkoKSB7IHJldHVybiAwOyB9CiAKKyAgICAv LyBTaXRlIElzb2xhdGlvbiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KKworICAgIHZpcnR1YWwgdm9pZCByZWNvcmRDcm9zc0ZyYW1lQWNjZXNz KGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFdlYlN0cmluZyYgbmFtZSkgeyB9CisKICAgICAvLyBT dWRkZW4gVGVybWluYXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIAogICAgIC8vIERpc2FibGUvRW5hYmxlIHN1ZGRlbiB0ZXJtaW5hdGlvbi4K SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCShyZXZpc2lvbiA1NTU2 MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01MDYsNiArNTA2LDE0IEBAIHZvaWQgQ2hyb21pdW1CcmlkZ2U6OnN0b3BTaGFyZWRU aW1lcigpCiAgICAgd2ViS2l0Q2xpZW50KCktPnN0b3BTaGFyZWRUaW1lcigpOwogfQogCisvLyBT aXRlSXNvbGF0aW9uIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCisKK3ZvaWQgQ2hyb21pdW1CcmlkZ2U6OnJlY29yZENyb3NzRnJh bWVBY2Nlc3MoRnJhbWUqIGZyYW1lLCBib29sIGNyb3NzT3JpZ2luLCBjb25zdCBTdHJpbmcmIG5h bWUpCit7CisgICAgV2ViRnJhbWVJbXBsKiBmcmFtZUltcGwgPSBXZWJGcmFtZUltcGw6OmZyb21G cmFtZShmcmFtZSk7CisgICAgZnJhbWVJbXBsLT5jbGllbnQoKS0+ZGlkTWFrZUNyb3NzRnJhbWVB Y2Nlc3MoZnJhbWVJbXBsLCBjcm9zc09yaWdpbiwgbmFtZSk7Cit9CisKIC8vIFN0YXRzQ291bnRl cnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIAogdm9pZCBDaHJvbWl1bUJyaWRnZTo6ZGVjcmVtZW50U3RhdHNDb3VudGVyKGNv bnN0IGNoYXIqIG5hbWUpCg== 50856 2010-03-16 17:25:29 -0700 2010-03-17 09:53:21 -0700 patch with event id bug35773d.diff text/plain 8343 johnnyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjA5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMtMDQgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3NlcyBmb3Ig c2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzczCisKKyAgICAgICAgQWRkIHRyYWNraW5nIG9mIGFjY2VzcyB0byBwcm9wZXJ0 aWVzIG1hcmtlZCBbRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5XS4KKworICAgICAgICBObyBuZXcg dGVzdHMgYmVjYXVzZSBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZS4KKworICAgICAgICAqIGJpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4 VXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvZ1NpdGVJc29sYXRpb25BY2Nlc3Mp OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmg6CisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaDoKKwogMjAxMC0wMy0xNiAgQnJlbnQgRnVsZ2hh bSAgPGJmdWxnaGFtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4LiAgTm8gUmV2aWV3 LgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCShy ZXZpc2lvbiA1NjA5MykKKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y VjgucG0JKHdvcmtpbmcgY29weSkKQEAgLTY3Myw2ICs2NzMsMTEgQEAgRU5ECiAgICAgICAgIHB1 c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgaWYgKCFWOEJpbmRpbmdTZWN1cml0eTo6Y2hlY2tO b2RlU2VjdXJpdHkoVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKSwgaW1wLT4kYXR0ck5hbWUoKSkpIHJl dHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTtcblxuIik7CiAgICAgfSBlbHNpZiAoJGF0dHJp YnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ2hlY2tGcmFtZVNlY3VyaXR5 In0pIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBpZiAoIVY4QmluZGlu Z1NlY3VyaXR5OjpjaGVja05vZGVTZWN1cml0eShWOEJpbmRpbmdTdGF0ZTo6T25seSgpLCBpbXAt PmNvbnRlbnREb2N1bWVudCgpKSkgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpO1xuXG4i KTsKKyAgICB9IAorCisgICAgaWYgKCRhdHRyRXh0LT57IkRvTm90Q2hlY2tEb21haW5TZWN1cml0 eSJ9IHx8IAorICAgICAgICAkYXR0ckV4dC0+eyJEb05vdENoZWNrRG9tYWluU2VjdXJpdHlPbkdl dCJ9KSB7CisgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgbG9nU2l0ZUlzb2xh dGlvbkFjY2VzcyhuYW1lLCBpbmZvKTtcbiIpOwogICAgIH0KIAogICAgIG15ICR1c2VFeGNlcHRp b25zID0gMSBpZiBAeyRhdHRyaWJ1dGUtPmdldHRlckV4Y2VwdGlvbnN9IGFuZCAhKCRpc1BvZFR5 cGUpOwpAQCAtMTQ0OSw2ICsxNDU0LDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAg ICAgICAgICIjaW5jbHVkZSBcIlY4QmluZGluZy5oXCJcbiIgLgogICAgICAgICAgIiNpbmNsdWRl IFwiVjhCaW5kaW5nU3RhdGUuaFwiXG4iIC4KICAgICAgICAgICIjaW5jbHVkZSBcIlY4RE9NV3Jh cHBlci5oXCJcbiIgLgorICAgICAgICAgIiNpbmNsdWRlIFwiVjhVdGlsaXRpZXMuaFwiXG4iIC4K ICAgICAgICAgICIjaW5jbHVkZSBcIlY4SXNvbGF0ZWRDb250ZXh0LmhcIlxuXG4iIC4KICAgICAg ICAgICIjdW5kZWYgTE9HXG5cbiIpOwogCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRp bGl0aWVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVz LmNwcAkocmV2aXNpb24gNTYwOTMpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsMTEgKzMzLDE0IEBACiAKICNpbmNsdWRlIDx2OC5o PgogCisjaW5jbHVkZSAiQ2hyb21pdW1CcmlkZ2UuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgog I2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIgog I2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCisjaW5jbHVk ZSAiVjhCaW5kaW5nU3RhdGUuaCIKKyNpbmNsdWRlICJWOERPTVdpbmRvdy5oIgogI2luY2x1ZGUg IlY4UHJveHkuaCIKICNpbmNsdWRlICJXb3JrZXJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV29ya2Vy Q29udGV4dEV4ZWN1dGlvblByb3h5LmgiCkBAIC0xNDYsNiArMTQ5LDMyIEBAIFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIGdldFNjcmlwdEV4ZWN1dGkKICAgICByZXR1cm4gMDsKIH0KIAordm9pZCBs b2dTaXRlSXNvbGF0aW9uQWNjZXNzKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2 ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQoreworICAgIEZyYW1lKiB0YXJnZXQgPSBWOERPTVdpbmRv dzo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSktPmZyYW1lKCk7CisgICAgRnJhbWUqIGFjdGl2ZSA9 IFY4QmluZGluZ1N0YXRlOjpPbmx5KCktPmdldEFjdGl2ZVdpbmRvdygpLT5mcmFtZSgpOworICAg IGlmICh0YXJnZXQgPT0gYWN0aXZlKQorICAgICAgICByZXR1cm47CisKKyAgICBib29sIGNyb3Nz U2l0ZSA9ICFWOEJpbmRpbmdTZWN1cml0eTo6Y2FuQWNjZXNzRnJhbWUoVjhCaW5kaW5nU3RhdGU6 Ok9ubHkoKSwgdGFyZ2V0LCBmYWxzZSk7CisgICAgU3RyaW5nIHByb3BOYW1lID0gdG9XZWJDb3Jl U3RyaW5nKG5hbWUpOworCisgICAgLy8gRm9yIGNyb3NzLXNpdGUsIHdlIGFsc28gd2FudCB0byBp ZGVudGlmeSB0aGUgY3VycmVudCBldmVudCB0byByZWNvcmQgcmVwZWF0IGFjY2Vzc2VzLgorICAg IHVuc2lnbmVkIGxvbmcgbG9uZyBldmVudElkID0gMDsKKyAgICBpZiAoY3Jvc3NTaXRlKSB7Cisg ICAgICAgIHY4OjpIYW5kbGVTY29wZSBoYW5kbGVTY29wZTsKKyAgICAgICAgdjg6OkhhbmRsZTx2 ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gVjhQcm94eTo6bWFpbldvcmxkQ29udGV4dChhY3RpdmUp OworICAgICAgICBpZiAoIXY4Q29udGV4dC5Jc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIHY4OjpD b250ZXh0OjpTY29wZSBzY29wZSh2OENvbnRleHQpOworICAgICAgICAgICAgdjg6OkhhbmRsZTx2 ODo6T2JqZWN0PiBnbG9iYWwgPSB2OENvbnRleHQtPkdsb2JhbCgpOworICAgICAgICAgICAgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IGpzRXZlbnQgPSBnbG9iYWwtPkdldCh2ODo6U3RyaW5nOjpOZXdT eW1ib2woImV2ZW50IikpOworICAgICAgICAgICAgaWYgKFY4RE9NV3JhcHBlcjo6aXNWYWxpZERP TU9iamVjdChqc0V2ZW50KSkKKyAgICAgICAgICAgICAgICBldmVudElkID0gKHVuc2lnbmVkIGxv bmcgbG9uZykgVjhFdmVudDo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChq c0V2ZW50KSk7CisgICAgICAgIH0KKyAgICB9CisgICAgQ2hyb21pdW1CcmlkZ2U6OnJlY29yZENy b3NzRnJhbWVBY2Nlc3MoYWN0aXZlLCBjcm9zc1NpdGUsIHByb3BOYW1lLCBldmVudElkKTsKK30K Kwogdm9pZCByZXBvcnRFeGNlcHRpb24oU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlLCB2ODo6VHJ5 Q2F0Y2gmIGV4Y2VwdGlvbkNhdGNoZXIpCiB7CiAgICAgU3RyaW5nIGVycm9yTWVzc2FnZTsKSW5k ZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmgJKHJldmlzaW9uIDU2MDkzKQorKysgV2ViQ29y ZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw4 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIHZvaWQgcmVwb3J0RXhjZXB0aW9uKFNjcmlw dFN0YXRlKiwgdjg6OlRyeUNhdGNoJik7CiAKKyAgICB2b2lkIGxvZ1NpdGVJc29sYXRpb25BY2Nl c3Modjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGlu Zm8pOworCiAgICAgY2xhc3MgQWxsb3dBbGxvY2F0aW9uIHsKICAgICBwdWJsaWM6CiAgICAgICAg IGlubGluZSBBbGxvd0FsbG9jYXRpb24oKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9DaHJvbWl1bUJyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vQ2hyb21pdW1CcmlkZ2UuaAkocmV2aXNpb24gNTYwOTMpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4OSw2ICsxODks OSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyB2b2lkIHNldFNoYXJlZFRp bWVyRmlyZVRpbWUoZG91YmxlIGZpcmVUaW1lKTsKICAgICAgICAgc3RhdGljIHZvaWQgc3RvcFNo YXJlZFRpbWVyKCk7CiAKKyAgICAgICAgLy8gU2l0ZSBJc29sYXRpb24gLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgc3RhdGljIHZv aWQgcmVjb3JkQ3Jvc3NGcmFtZUFjY2VzcyhGcmFtZSosIGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0 IFN0cmluZyYgcHJvcGVydHkpOworCiAgICAgICAgIC8vIFN0YXRzQ291bnRlcnMgLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgIHN0 YXRpYyB2b2lkIGRlY3JlbWVudFN0YXRzQ291bnRlcihjb25zdCBjaGFyKiBuYW1lKTsKICAgICAg ICAgc3RhdGljIHZvaWQgaW5jcmVtZW50U3RhdHNDb3VudGVyKGNvbnN0IGNoYXIqIG5hbWUpOwpJ bmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NjA5MykKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wMy0wNCAgSm9obiBH cmVnZyAgPGpvaG5ueWdAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGFkZCBsb2dnaW5nIG9mIGNyb3NzLWZyYW1l IHByb3BlcnR5IGFjY2Vzc2VzIGZvciBzaXRlIGlzb2xhdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3NzMKKworICAgICAgICBBZGQgY2FsbHMg b3V0IHRvIHRoZSBXZWJGcmFtZUNsaWVudCB3aGVuZXZlciBhIHBhZ2UgYWNjZXNzZXMgYSBwcm9w ZXJ0eSBvZiAKKyAgICAgICAgYSBmcmFtZSB3aGljaCB3YXMgbWFya2VkIFtEb05vdENoZWNrRG9t YWluU2VjdXJpdHldLgorCisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50Lmg6CisgICAg ICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50OjpkaWRNYWtlQ3Jvc3NGcmFtZUFjY2Vzcyk6Cisg ICAgICAgICogcHVibGljL1dlYktpdENsaWVudC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJLaXRD bGllbnQ6OnJlY29yZENyb3NzRnJhbWVBY2Nlc3MpOgorICAgICAgICAqIHNyYy9DaHJvbWl1bUJy aWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bUJyaWRnZTo6cmVjb3JkQ3Jvc3NG cmFtZUFjY2Vzcyk6CisKIDIwMTAtMDMtMTYgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgJKHJldmlzaW9uIDU2MDkzKQorKysgV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODEs NiArMjgxLDkgQEAgcHVibGljOgogICAgIC8vIHNjcmlwdHMuCiAgICAgdmlydHVhbCB2b2lkIGRp ZENyZWF0ZUlzb2xhdGVkU2NyaXB0Q29udGV4dChXZWJGcmFtZSopIHsgfQogCisgICAgLy8gTm90 aWZpZXMgdGhhdCBhIGNyb3NzLWZyYW1lIGFjY2VzcyB3YXMgbWFkZS4KKyAgICB2aXJ0dWFsIHZv aWQgZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3MoV2ViRnJhbWUqLCBib29sIGNyb3NzT3JpZ2luLCBj b25zdCBXZWJTdHJpbmcmIHByb3BlcnR5KSB7IH0KKwogCiAgICAgLy8gR2VvbWV0cnkgbm90aWZp Y2F0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAK SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViS2l0Q2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJLaXRDbGllbnQuaAkocmV2aXNpb24gNTYwOTMp CisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYktpdENsaWVudC5oCSh3b3JraW5nIGNvcHkp CkBAIC0yNDcsNiArMjQ3LDEwIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgV2ViU2hhcmVkV29y a2VyUmVwb3NpdG9yeSogc2hhcmVkV29ya2VyUmVwb3NpdG9yeSgpIHsgcmV0dXJuIDA7IH0KIAor ICAgIC8vIFNpdGUgSXNvbGF0aW9uIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQorCisgICAgdmlydHVhbCB2b2lkIHJlY29yZENyb3NzRnJhbWVB Y2Nlc3MoYm9vbCBjcm9zc09yaWdpbiwgY29uc3QgV2ViU3RyaW5nJiBuYW1lKSB7IH0KKwogICAg IC8vIFN1ZGRlbiBUZXJtaW5hdGlvbiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogCiAgICAgLy8gRGlzYWJsZS9FbmFibGUgc3VkZGVuIHRlcm1pbmF0 aW9uLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAJKHJldmlzaW9u IDU2MDkzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTUyMCw2ICs1MjAsMTQgQEAgdm9pZCBDaHJvbWl1bUJyaWRnZTo6c3RvcFNo YXJlZFRpbWVyKCkKICAgICB3ZWJLaXRDbGllbnQoKS0+c3RvcFNoYXJlZFRpbWVyKCk7CiB9CiAK Ky8vIFNpdGVJc29sYXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKwordm9pZCBDaHJvbWl1bUJyaWRnZTo6cmVjb3JkQ3Jv c3NGcmFtZUFjY2VzcyhGcmFtZSogZnJhbWUsIGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFN0cmlu ZyYgbmFtZSkKK3sKKyAgICBXZWJGcmFtZUltcGwqIGZyYW1lSW1wbCA9IFdlYkZyYW1lSW1wbDo6 ZnJvbUZyYW1lKGZyYW1lKTsKKyAgICBmcmFtZUltcGwtPmNsaWVudCgpLT5kaWRNYWtlQ3Jvc3NG cmFtZUFjY2VzcyhmcmFtZUltcGwsIGNyb3NzT3JpZ2luLCBuYW1lKTsKK30KKwogLy8gU3RhdHND b3VudGVycyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogCiB2b2lkIENocm9taXVtQnJpZGdlOjpkZWNyZW1lbnRTdGF0c0NvdW50 ZXIoY29uc3QgY2hhciogbmFtZSkK 50916 2010-03-17 09:53:21 -0700 2010-03-23 17:13:25 -0700 corrected patch bug35773e.diff text/plain 6848 johnnyg SW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkocmV2 aXNpb24gNTYwODcpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4 LnBtCSh3b3JraW5nIGNvcHkpCkBAIC02NzMsNiArNjczLDExIEBAIEVORAogICAgICAgICBwdXNo KEBpbXBsQ29udGVudERlY2xzLCAiICAgIGlmICghVjhCaW5kaW5nU2VjdXJpdHk6OmNoZWNrTm9k ZVNlY3VyaXR5KFY4QmluZGluZ1N0YXRlOjpPbmx5KCksIGltcC0+JGF0dHJOYW1lKCkpKSByZXR1 cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7XG5cbiIpOwogICAgIH0gZWxzaWYgKCRhdHRyaWJ1 dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNoZWNrRnJhbWVTZWN1cml0eSJ9 KSB7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgaWYgKCFWOEJpbmRpbmdT ZWN1cml0eTo6Y2hlY2tOb2RlU2VjdXJpdHkoVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKSwgaW1wLT5j b250ZW50RG9jdW1lbnQoKSkpIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTtcblxuIik7 CisgICAgfSAKKworICAgIGlmICgkYXR0ckV4dC0+eyJEb05vdENoZWNrRG9tYWluU2VjdXJpdHki fSB8fCAKKyAgICAgICAgJGF0dHJFeHQtPnsiRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5T25HZXQi fSkgeworICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIGxvZ1NpdGVJc29sYXRp b25BY2Nlc3MobmFtZSwgaW5mbyk7XG4iKTsKICAgICB9CiAKICAgICBteSAkdXNlRXhjZXB0aW9u cyA9IDEgaWYgQHskYXR0cmlidXRlLT5nZXR0ZXJFeGNlcHRpb25zfSBhbmQgISgkaXNQb2RUeXBl KTsKQEAgLTE0NDksNiArMTQ1NCw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAg ICAgICAiI2luY2x1ZGUgXCJWOEJpbmRpbmcuaFwiXG4iIC4KICAgICAgICAgICIjaW5jbHVkZSBc IlY4QmluZGluZ1N0YXRlLmhcIlxuIiAuCiAgICAgICAgICAiI2luY2x1ZGUgXCJWOERPTVdyYXBw ZXIuaFwiXG4iIC4KKyAgICAgICAgICIjaW5jbHVkZSBcIlY4VXRpbGl0aWVzLmhcIlxuIiAuCiAg ICAgICAgICAiI2luY2x1ZGUgXCJWOElzb2xhdGVkQ29udGV4dC5oXCJcblxuIiAuCiAgICAgICAg ICAiI3VuZGVmIExPR1xuXG4iKTsKIApJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxp dGllcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5j cHAJKHJldmlzaW9uIDU2MDg3KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDExICszMywxNCBAQAogCiAjaW5jbHVkZSA8djguaD4K IAorI2luY2x1ZGUgIkNocm9taXVtQnJpZGdlLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNp bmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKICNp bmNsdWRlICJTY3JpcHRTdGF0ZS5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgorI2luY2x1ZGUg IlY4QmluZGluZ1N0YXRlLmgiCisjaW5jbHVkZSAiVjhET01XaW5kb3cuaCIKICNpbmNsdWRlICJW OFByb3h5LmgiCiAjaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIgogI2luY2x1ZGUgIldvcmtlckNv bnRleHRFeGVjdXRpb25Qcm94eS5oIgpAQCAtMTQ2LDYgKzE0OSwzMiBAQCBTY3JpcHRFeGVjdXRp b25Db250ZXh0KiBnZXRTY3JpcHRFeGVjdXRpCiAgICAgcmV0dXJuIDA7CiB9CiAKK3ZvaWQgbG9n U2l0ZUlzb2xhdGlvbkFjY2Vzcyh2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgY29uc3Qgdjg6 OkFjY2Vzc29ySW5mbyYgaW5mbykKK3sKKyAgICBGcmFtZSogdGFyZ2V0ID0gVjhET01XaW5kb3c6 OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpLT5mcmFtZSgpOworICAgIEZyYW1lKiBhY3RpdmUgPSBW OEJpbmRpbmdTdGF0ZTo6T25seSgpLT5nZXRBY3RpdmVXaW5kb3coKS0+ZnJhbWUoKTsKKyAgICBp ZiAodGFyZ2V0ID09IGFjdGl2ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgYm9vbCBjcm9zc1Np dGUgPSAhVjhCaW5kaW5nU2VjdXJpdHk6OmNhbkFjY2Vzc0ZyYW1lKFY4QmluZGluZ1N0YXRlOjpP bmx5KCksIHRhcmdldCwgZmFsc2UpOworICAgIFN0cmluZyBwcm9wTmFtZSA9IHRvV2ViQ29yZVN0 cmluZyhuYW1lKTsKKworICAgIC8vIEZvciBjcm9zcy1zaXRlLCB3ZSBhbHNvIHdhbnQgdG8gaWRl bnRpZnkgdGhlIGN1cnJlbnQgZXZlbnQgdG8gcmVjb3JkIHJlcGVhdCBhY2Nlc3Nlcy4KKyAgICB1 bnNpZ25lZCBsb25nIGxvbmcgZXZlbnRJZCA9IDA7CisgICAgaWYgKGNyb3NzU2l0ZSkgeworICAg ICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CisgICAgICAgIHY4OjpIYW5kbGU8djg6 OkNvbnRleHQ+IHY4Q29udGV4dCA9IFY4UHJveHk6Om1haW5Xb3JsZENvbnRleHQoYWN0aXZlKTsK KyAgICAgICAgaWYgKCF2OENvbnRleHQuSXNFbXB0eSgpKSB7CisgICAgICAgICAgICB2ODo6Q29u dGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKKyAgICAgICAgICAgIHY4OjpIYW5kbGU8djg6 Ok9iamVjdD4gZ2xvYmFsID0gdjhDb250ZXh0LT5HbG9iYWwoKTsKKyAgICAgICAgICAgIHY4OjpI YW5kbGU8djg6OlZhbHVlPiBqc0V2ZW50ID0gZ2xvYmFsLT5HZXQodjg6OlN0cmluZzo6TmV3U3lt Ym9sKCJldmVudCIpKTsKKyAgICAgICAgICAgIGlmIChWOERPTVdyYXBwZXI6OmlzVmFsaWRET01P YmplY3QoanNFdmVudCkpCisgICAgICAgICAgICAgICAgZXZlbnRJZCA9ICh1bnNpZ25lZCBsb25n IGxvbmcpIFY4RXZlbnQ6OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoanNF dmVudCkpOworICAgICAgICB9CisgICAgfQorICAgIENocm9taXVtQnJpZGdlOjpyZWNvcmRDcm9z c0ZyYW1lQWNjZXNzKGFjdGl2ZSwgY3Jvc3NTaXRlLCBwcm9wTmFtZSwgZXZlbnRJZCk7Cit9CisK IHZvaWQgcmVwb3J0RXhjZXB0aW9uKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgdjg6OlRyeUNh dGNoJiBleGNlcHRpb25DYXRjaGVyKQogewogICAgIFN0cmluZyBlcnJvck1lc3NhZ2U7CkluZGV4 OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5oCShyZXZpc2lvbiA1NjA4NykKKysrIFdlYkNvcmUv YmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsOCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICB2b2lkIHJlcG9ydEV4Y2VwdGlvbihTY3JpcHRT dGF0ZSosIHY4OjpUcnlDYXRjaCYpOwogCisgICAgdm9pZCBsb2dTaXRlSXNvbGF0aW9uQWNjZXNz KHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZv KTsKKwogICAgIGNsYXNzIEFsbG93QWxsb2NhdGlvbiB7CiAgICAgcHVibGljOgogICAgICAgICBp bmxpbmUgQWxsb3dBbGxvY2F0aW9uKCkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v Q2hyb21pdW1CcmlkZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L0Nocm9taXVtQnJpZGdlLmgJKHJldmlzaW9uIDU2MDg3KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODksNiArMTg5LDkg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBzdGF0aWMgdm9pZCBzZXRTaGFyZWRUaW1l ckZpcmVUaW1lKGRvdWJsZSBmaXJlVGltZSk7CiAgICAgICAgIHN0YXRpYyB2b2lkIHN0b3BTaGFy ZWRUaW1lcigpOwogCisgICAgICAgIC8vIFNpdGUgSXNvbGF0aW9uIC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisgICAgICAgIHN0YXRpYyB2b2lk IHJlY29yZENyb3NzRnJhbWVBY2Nlc3MoRnJhbWUqLCBib29sIGNyb3NzT3JpZ2luLCBjb25zdCBT dHJpbmcmIHByb3BlcnR5LCB1bnNpZ25lZCBsb25nIGxvbmcgZXZlbnRJZCk7CisKICAgICAgICAg Ly8gU3RhdHNDb3VudGVycyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KICAgICAgICAgc3RhdGljIHZvaWQgZGVjcmVtZW50U3RhdHNDb3VudGVy KGNvbnN0IGNoYXIqIG5hbWUpOwogICAgICAgICBzdGF0aWMgdm9pZCBpbmNyZW1lbnRTdGF0c0Nv dW50ZXIoY29uc3QgY2hhciogbmFtZSk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU2MDg3 KQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE4IEBACisyMDEwLTAzLTA0ICBKb2huIEdyZWdnICA8am9obm55Z0Bnb29nbGUuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0g YWRkIGxvZ2dpbmcgb2YgY3Jvc3MtZnJhbWUgcHJvcGVydHkgYWNjZXNzZXMgZm9yIHNpdGUgaXNv bGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NTc3MworCisgICAgICAgIEFkZCBjYWxscyBvdXQgdG8gdGhlIFdlYkZyYW1lQ2xpZW50IHdoZW5l dmVyIGEgcGFnZSBhY2Nlc3NlcyBhIHByb3BlcnR5IG9mIAorICAgICAgICBhIGZyYW1lIHdoaWNo IHdhcyBtYXJrZWQgW0RvTm90Q2hlY2tEb21haW5TZWN1cml0eV0uCisKKyAgICAgICAgKiBwdWJs aWMvV2ViRnJhbWVDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmRp ZE1ha2VDcm9zc0ZyYW1lQWNjZXNzKToKKyAgICAgICAgKiBzcmMvQ2hyb21pdW1CcmlkZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21pdW1CcmlkZ2U6OnJlY29yZENyb3NzRnJhbWVBY2Nl c3MpOgorCiAyMDEwLTAzLTE2ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkZyYW1lQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZUNsaWVudC5oCShyZXZpc2lvbiA1NjA4NykKKysrIFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjgxLDYgKzI4MSw5 IEBAIHB1YmxpYzoKICAgICAvLyBzY3JpcHRzLgogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVJ c29sYXRlZFNjcmlwdENvbnRleHQoV2ViRnJhbWUqKSB7IH0KIAorICAgIC8vIE5vdGlmaWVzIHRo YXQgYSBjcm9zcy1mcmFtZSBhY2Nlc3Mgd2FzIG1hZGUuCisgICAgdmlydHVhbCB2b2lkIGRpZE1h a2VDcm9zc0ZyYW1lQWNjZXNzKFdlYkZyYW1lKiwgYm9vbCBjcm9zc09yaWdpbiwgY29uc3QgV2Vi U3RyaW5nJiBwcm9wZXJ0eSwgdW5zaWduZWQgbG9uZyBsb25nKSB7IH0KKwogCiAgICAgLy8gR2Vv bWV0cnkgbm90aWZpY2F0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCShy ZXZpc2lvbiA1NjA4NykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01MjAsNiArNTIwLDE0IEBAIHZvaWQgQ2hyb21pdW1CcmlkZ2U6 OnN0b3BTaGFyZWRUaW1lcigpCiAgICAgd2ViS2l0Q2xpZW50KCktPnN0b3BTaGFyZWRUaW1lcigp OwogfQogCisvLyBTaXRlSXNvbGF0aW9uIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKK3ZvaWQgQ2hyb21pdW1CcmlkZ2U6OnJl Y29yZENyb3NzRnJhbWVBY2Nlc3MoRnJhbWUqIGZyYW1lLCBib29sIGNyb3NzT3JpZ2luLCBjb25z dCBTdHJpbmcmIG5hbWUsIHVuc2lnbmVkIGxvbmcgbG9uZyBldmVudElkKQoreworICAgIFdlYkZy YW1lSW1wbCogZnJhbWVJbXBsID0gV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUoZnJhbWUpOworICAg IGZyYW1lSW1wbC0+Y2xpZW50KCktPmRpZE1ha2VDcm9zc0ZyYW1lQWNjZXNzKGZyYW1lSW1wbCwg Y3Jvc3NPcmlnaW4sIG5hbWUsIGV2ZW50SWQpOworfQorCiAvLyBTdGF0c0NvdW50ZXJzIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAKIHZvaWQgQ2hyb21pdW1CcmlkZ2U6OmRlY3JlbWVudFN0YXRzQ291bnRlcihjb25zdCBjaGFy KiBuYW1lKQo= 51468 2010-03-23 17:13:25 -0700 2010-03-30 12:19:39 -0700 patch using FrameLoaderClient bug35773_loader.diff text/plain 7665 johnnyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjQyOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDMtMjMgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3NlcyBmb3Ig c2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzczCisKKyAgICAgICAgTm8gbmV3IHRlc3RzOyBubyBjaGFuZ2UgaW4gZnVuY3Rp b25hbGl0eS4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBt OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmxvZ1NpdGVJc29sYXRpb25BY2Nlc3MpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4VXRp bGl0aWVzLmg6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6ZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3MpOgor CiAyMDEwLTAzLTIzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0JKHJldmlzaW9uIDU2NDI0KQorKysgV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkod29ya2luZyBjb3B5KQpAQCAt Njc0LDYgKzY3NCwxMSBAQCBFTkQKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAg ICBpZiAoIVY4QmluZGluZ1NlY3VyaXR5OjpjaGVja05vZGVTZWN1cml0eShWOEJpbmRpbmdTdGF0 ZTo6T25seSgpLCBpbXAtPiRhdHRyTmFtZSgpKSkgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVl PigpO1xuXG4iKTsKICAgICB9IGVsc2lmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVk QXR0cmlidXRlcy0+eyJDaGVja0ZyYW1lU2VjdXJpdHkifSkgewogICAgICAgICBwdXNoKEBpbXBs Q29udGVudERlY2xzLCAiICAgIGlmICghVjhCaW5kaW5nU2VjdXJpdHk6OmNoZWNrTm9kZVNlY3Vy aXR5KFY4QmluZGluZ1N0YXRlOjpPbmx5KCksIGltcC0+Y29udGVudERvY3VtZW50KCkpKSByZXR1 cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7XG5cbiIpOworICAgIH0gCisKKyAgICBpZiAoJGF0 dHJFeHQtPnsiRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5In0gfHwgCisgICAgICAgICRhdHRyRXh0 LT57IkRvTm90Q2hlY2tEb21haW5TZWN1cml0eU9uR2V0In0pIHsKKyAgICAgICAgcHVzaChAaW1w bENvbnRlbnREZWNscywgIiAgICBsb2dTaXRlSXNvbGF0aW9uQWNjZXNzKG5hbWUsIGluZm8pO1xu Iik7CiAgICAgfQogCiAgICAgbXkgJHVzZUV4Y2VwdGlvbnMgPSAxIGlmIEB7JGF0dHJpYnV0ZS0+ Z2V0dGVyRXhjZXB0aW9uc30gYW5kICEoJGlzUG9kVHlwZSk7CkBAIC0xNDQ2LDYgKzE0NTEsNyBA QCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhCaW5k aW5nLmhcIlxuIiAuCiAgICAgICAgICAiI2luY2x1ZGUgXCJWOEJpbmRpbmdTdGF0ZS5oXCJcbiIg LgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhET01XcmFwcGVyLmhcIlxuIiAuCisgICAgICAgICAi I2luY2x1ZGUgXCJWOFV0aWxpdGllcy5oXCJcbiIgLgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhJ c29sYXRlZENvbnRleHQuaFwiXG5cbiIgLgogICAgICAgICAgIiN1bmRlZiBMT0dcblxuIik7CiAK SW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwCShyZXZpc2lvbiA1NjQyNCkKKysr IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z MywxMSArMzMsMTUgQEAKIAogI2luY2x1ZGUgPHY4Lmg+CiAKKyNpbmNsdWRlICJDaHJvbWl1bUJy aWRnZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNs dWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQuaCIKICNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgor I2luY2x1ZGUgIlY4QmluZGluZ1N0YXRlLmgiCisjaW5jbHVkZSAiVjhET01XaW5kb3cuaCIKICNp bmNsdWRlICJWOFByb3h5LmgiCiAjaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIgogI2luY2x1ZGUg IldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5oIgpAQCAtMTQwLDQgKzE0NCwzMCBAQCBTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiBnZXRTY3JpcHRFeGVjdXRpCiAgICAgcmV0dXJuIDA7CiB9CiAK K3ZvaWQgbG9nU2l0ZUlzb2xhdGlvbkFjY2Vzcyh2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwg Y29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbykKK3sKKyAgICBGcmFtZSogdGFyZ2V0ID0gVjhE T01XaW5kb3c6OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpLT5mcmFtZSgpOworICAgIEZyYW1lKiBh Y3RpdmUgPSBWOEJpbmRpbmdTdGF0ZTo6T25seSgpLT5nZXRBY3RpdmVXaW5kb3coKS0+ZnJhbWUo KTsKKyAgICBpZiAodGFyZ2V0ID09IGFjdGl2ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgYm9v bCBjcm9zc1NpdGUgPSAhVjhCaW5kaW5nU2VjdXJpdHk6OmNhbkFjY2Vzc0ZyYW1lKFY4QmluZGlu Z1N0YXRlOjpPbmx5KCksIHRhcmdldCwgZmFsc2UpOworICAgIFN0cmluZyBwcm9wTmFtZSA9IHRv V2ViQ29yZVN0cmluZyhuYW1lKTsKKworICAgIC8vIEZvciBjcm9zcy1zaXRlLCB3ZSBhbHNvIHdh bnQgdG8gaWRlbnRpZnkgdGhlIGN1cnJlbnQgZXZlbnQgdG8gcmVjb3JkIHJlcGVhdCBhY2Nlc3Nl cy4KKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgZXZlbnRJZCA9IDA7CisgICAgaWYgKGNyb3NzU2l0 ZSkgeworICAgICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CisgICAgICAgIHY4OjpI YW5kbGU8djg6OkNvbnRleHQ+IHY4Q29udGV4dCA9IFY4UHJveHk6Om1haW5Xb3JsZENvbnRleHQo YWN0aXZlKTsKKyAgICAgICAgaWYgKCF2OENvbnRleHQuSXNFbXB0eSgpKSB7CisgICAgICAgICAg ICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKKyAgICAgICAgICAgIHY4OjpI YW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsID0gdjhDb250ZXh0LT5HbG9iYWwoKTsKKyAgICAgICAg ICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBqc0V2ZW50ID0gZ2xvYmFsLT5HZXQodjg6OlN0cmlu Zzo6TmV3U3ltYm9sKCJldmVudCIpKTsKKyAgICAgICAgICAgIGlmIChWOERPTVdyYXBwZXI6Omlz VmFsaWRET01PYmplY3QoanNFdmVudCkpCisgICAgICAgICAgICAgICAgZXZlbnRJZCA9ICh1bnNp Z25lZCBsb25nIGxvbmcpIFY4RXZlbnQ6OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD46 OkNhc3QoanNFdmVudCkpOworICAgICAgICB9CisgICAgfQorICAgIGFjdGl2ZS0+bG9hZGVyKCkt PmNsaWVudCgpLT5kaWRNYWtlQ3Jvc3NGcmFtZUFjY2Vzcyhjcm9zc1NpdGUsIHByb3BOYW1lLCBl dmVudElkKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9iaW5k aW5ncy92OC9WOFV0aWxpdGllcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvdjgv VjhVdGlsaXRpZXMuaAkocmV2aXNpb24gNTY0MjQpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 VXRpbGl0aWVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDggQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogZ2V0U2NyaXB0RXhlY3V0aW9u Q29udGV4dCgpOwogCisgICAgdm9pZCBsb2dTaXRlSXNvbGF0aW9uQWNjZXNzKHY4OjpMb2NhbDx2 ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKTsKKwogICAgIGNs YXNzIEFsbG93QWxsb2NhdGlvbiB7CiAgICAgcHVibGljOgogICAgICAgICBpbmxpbmUgQWxsb3dB bGxvY2F0aW9uKCkKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAkocmV2aXNpb24g NTY0MjQpCisrKyBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNv cHkpCkBAIC0yMzgsNiArMjM4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0 dWFsIHZvaWQgZGlkQ3JlYXRlU2NyaXB0Q29udGV4dEZvckZyYW1lKCkgPSAwOwogICAgICAgICB2 aXJ0dWFsIHZvaWQgZGlkRGVzdHJveVNjcmlwdENvbnRleHRGb3JGcmFtZSgpID0gMDsKICAgICAg ICAgdmlydHVhbCB2b2lkIGRpZENyZWF0ZUlzb2xhdGVkU2NyaXB0Q29udGV4dCgpID0gMDsKKwor ICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3MoYm9vbCBjcm9zc09y aWdpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCB1bnNpZ25lZCBsb25nIGxvbmcgZXZlbnRJZCkgeyB9 CiAjZW5kaWYKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJGb3JJY29uTm90aWZpY2F0 aW9uKGJvb2wgbGlzdGVuID0gdHJ1ZSkgPSAwOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1 NjQyOCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxNiBAQAorMjAxMC0wMy0yMyAgSm9obiBHcmVnZyAgPGpvaG5ueWdAZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21p dW1dIGFkZCBsb2dnaW5nIG9mIGNyb3NzLWZyYW1lIHByb3BlcnR5IGFjY2Vzc2VzIGZvciBzaXRl IGlzb2xhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzU3NzMKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZUNsaWVudC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZUNsaWVudDo6ZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3MpOgorICAgICAg ICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpGcmFt ZUxvYWRlckNsaWVudEltcGw6OmRpZE1ha2VDcm9zc0ZyYW1lQWNjZXNzKToKKyAgICAgICAgKiBz cmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmg6CisKIDIwMTAtMDMtMjMgIEtlbm5ldGggUnVzc2Vs bCAgPGtickBnb29nbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpJbmRl eDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAkocmV2aXNpb24gNTY0MjQp CisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTI4MSw2ICsyODEsOSBAQCBwdWJsaWM6CiAgICAgLy8gc2NyaXB0cy4KICAgICB2aXJ0 dWFsIHZvaWQgZGlkQ3JlYXRlSXNvbGF0ZWRTY3JpcHRDb250ZXh0KFdlYkZyYW1lKikgeyB9CiAK KyAgICAvLyBOb3RpZmllcyB0aGF0IGEgY3Jvc3MtZnJhbWUgYWNjZXNzIHdhcyBtYWRlLgorICAg IHZpcnR1YWwgdm9pZCBkaWRNYWtlQ3Jvc3NGcmFtZUFjY2VzcyhXZWJGcmFtZSosIGJvb2wgY3Jv c3NPcmlnaW4sIGNvbnN0IFdlYlN0cmluZyYgcHJvcGVydHksIHVuc2lnbmVkIGxvbmcgbG9uZykg eyB9CisKIAogICAgIC8vIEdlb21ldHJ5IG5vdGlmaWNhdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA1NjQyNCkKKysrIFdlYktp dC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTUzNiw0ICsxNTM2LDkgQEAgUGFzc093blB0cjxXZWJQbHVnaW5Mb2FkT2JzZXJ2ZXI+IEZy YW1lTAogICAgIHJldHVybiBkcy0+cmVsZWFzZVBsdWdpbkxvYWRPYnNlcnZlcigpOwogfQogCit2 b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3MoYm9vbCBj cm9zc09yaWdpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCB1bnNpZ25lZCBsb25nIGxvbmcgZXZlbnRJ ZCkKK3sKKyAgICBtX3dlYkZyYW1lLT5jbGllbnQoKS0+ZGlkTWFrZUNyb3NzRnJhbWVBY2Nlc3Mo bV93ZWJGcmFtZSwgY3Jvc3NPcmlnaW4sIG5hbWUsIGV2ZW50SWQpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJ bXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVu dEltcGwuaAkocmV2aXNpb24gNTY0MjQpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9h ZGVyQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTksNiArMTk5LDkgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBkaWROb3RBbGxvd1NjcmlwdCgpOwogICAgIHZpcnR1YWwgdm9p ZCBkaWROb3RBbGxvd1BsdWdpbnMoKTsKIAorICAgIHZpcnR1YWwgdm9pZCBkaWRNYWtlQ3Jvc3NG cmFtZUFjY2VzcygKKyAgICAgICAgYm9vbCBjcm9zc09yaWdpbiwgY29uc3QgV2ViQ29yZTo6U3Ry aW5nJiBuYW1lLCB1bnNpZ25lZCBsb25nIGxvbmcgZXZlbnRJZCk7CisKIHByaXZhdGU6CiAgICAg dm9pZCBtYWtlRG9jdW1lbnRWaWV3KCk7CiAK 52067 2010-03-30 12:19:39 -0700 2010-03-30 14:14:33 -0700 patch with renames and Frame parameter 0330siteisolation.diff text/plain 7829 johnnyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjgwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDMtMzAgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3NlcyBmb3Ig c2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzczCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIG5vIGZ1bmN0aW9uYWxp dHkgY2hhbmdlZC4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4 LnBtOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmxvZ1Byb3BlcnR5QWNjZXNzKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFV0aWxp dGllcy5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnQ6OmxvZ0Nyb3NzRnJhbWVQcm9wZXJ0eUFjY2Vzcyk6 CisKIDIwMTAtMDMtMzAgIEFkYW0gTGFuZ2xleSAgPGFnbEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvclY4LnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yVjgucG0JKHJldmlzaW9uIDU2Nzk5KQorKysgV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkod29ya2luZyBjb3B5KQpAQCAtNjc0LDYg KzY3NCwxMSBAQCBFTkQKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBpZiAo IVY4QmluZGluZ1NlY3VyaXR5OjpjaGVja05vZGVTZWN1cml0eShWOEJpbmRpbmdTdGF0ZTo6T25s eSgpLCBpbXAtPiRhdHRyTmFtZSgpKSkgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpO1xu XG4iKTsKICAgICB9IGVsc2lmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJDaGVja0ZyYW1lU2VjdXJpdHkifSkgewogICAgICAgICBwdXNoKEBpbXBsQ29udGVu dERlY2xzLCAiICAgIGlmICghVjhCaW5kaW5nU2VjdXJpdHk6OmNoZWNrTm9kZVNlY3VyaXR5KFY4 QmluZGluZ1N0YXRlOjpPbmx5KCksIGltcC0+Y29udGVudERvY3VtZW50KCkpKSByZXR1cm4gdjg6 OkhhbmRsZTx2ODo6VmFsdWU+KCk7XG5cbiIpOworICAgIH0gCisKKyAgICBpZiAoJGF0dHJFeHQt PnsiRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5In0gfHwgCisgICAgICAgICRhdHRyRXh0LT57IkRv Tm90Q2hlY2tEb21haW5TZWN1cml0eU9uR2V0In0pIHsKKyAgICAgICAgcHVzaChAaW1wbENvbnRl bnREZWNscywgIiAgICBsb2dQcm9wZXJ0eUFjY2VzcyhuYW1lLCBpbmZvKTtcbiIpOwogICAgIH0K IAogICAgIG15ICR1c2VFeGNlcHRpb25zID0gMSBpZiBAeyRhdHRyaWJ1dGUtPmdldHRlckV4Y2Vw dGlvbnN9IGFuZCAhKCRpc1BvZFR5cGUpOwpAQCAtMTQ0Niw2ICsxNDUxLDcgQEAgc3ViIEdlbmVy YXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICIjaW5jbHVkZSBcIlY4QmluZGluZy5oXCJcbiIg LgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhCaW5kaW5nU3RhdGUuaFwiXG4iIC4KICAgICAgICAg ICIjaW5jbHVkZSBcIlY4RE9NV3JhcHBlci5oXCJcbiIgLgorICAgICAgICAgIiNpbmNsdWRlIFwi VjhVdGlsaXRpZXMuaFwiXG4iIC4KICAgICAgICAgICIjaW5jbHVkZSBcIlY4SXNvbGF0ZWRDb250 ZXh0LmhcIlxuXG4iIC4KICAgICAgICAgICIjdW5kZWYgTE9HXG5cbiIpOwogCkluZGV4OiBXZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkocmV2aXNpb24gNTY3OTkpCisrKyBXZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsMTEgKzMzLDE1 IEBACiAKICNpbmNsdWRlIDx2OC5oPgogCisjaW5jbHVkZSAiQ2hyb21pdW1CcmlkZ2UuaCIKICNp bmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVM b2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCiAjaW5j bHVkZSAiU2NyaXB0U3RhdGUuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKKyNpbmNsdWRlICJW OEJpbmRpbmdTdGF0ZS5oIgorI2luY2x1ZGUgIlY4RE9NV2luZG93LmgiCiAjaW5jbHVkZSAiVjhQ cm94eS5oIgogI2luY2x1ZGUgIldvcmtlckNvbnRleHQuaCIKICNpbmNsdWRlICJXb3JrZXJDb250 ZXh0RXhlY3V0aW9uUHJveHkuaCIKQEAgLTE0Miw0ICsxNDYsMzAgQEAgU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogZ2V0U2NyaXB0RXhlY3V0aQogICAgIHJldHVybiAwOwogfQogCit2b2lkIGxvZ1By b3BlcnR5QWNjZXNzKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2ODo6QWNjZXNz b3JJbmZvJiBpbmZvKQoreworICAgIEZyYW1lKiB0YXJnZXQgPSBWOERPTVdpbmRvdzo6dG9OYXRp dmUoaW5mby5Ib2xkZXIoKSktPmZyYW1lKCk7CisgICAgRnJhbWUqIGFjdGl2ZSA9IFY4QmluZGlu Z1N0YXRlOjpPbmx5KCktPmdldEFjdGl2ZVdpbmRvdygpLT5mcmFtZSgpOworICAgIGlmICh0YXJn ZXQgPT0gYWN0aXZlKQorICAgICAgICByZXR1cm47CisKKyAgICBib29sIGNyb3NzU2l0ZSA9ICFW OEJpbmRpbmdTZWN1cml0eTo6Y2FuQWNjZXNzRnJhbWUoVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKSwg dGFyZ2V0LCBmYWxzZSk7CisgICAgU3RyaW5nIHByb3BOYW1lID0gdG9XZWJDb3JlU3RyaW5nKG5h bWUpOworCisgICAgLy8gRm9yIGNyb3NzLXNpdGUsIHdlIGFsc28gd2FudCB0byBpZGVudGlmeSB0 aGUgY3VycmVudCBldmVudCB0byByZWNvcmQgcmVwZWF0IGFjY2Vzc2VzLgorICAgIHVuc2lnbmVk IGxvbmcgbG9uZyBldmVudElkID0gMDsKKyAgICBpZiAoY3Jvc3NTaXRlKSB7CisgICAgICAgIHY4 OjpIYW5kbGVTY29wZSBoYW5kbGVTY29wZTsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4 dD4gdjhDb250ZXh0ID0gVjhQcm94eTo6bWFpbldvcmxkQ29udGV4dChhY3RpdmUpOworICAgICAg ICBpZiAoIXY4Q29udGV4dC5Jc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIHY4OjpDb250ZXh0OjpT Y29wZSBzY29wZSh2OENvbnRleHQpOworICAgICAgICAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0 PiBnbG9iYWwgPSB2OENvbnRleHQtPkdsb2JhbCgpOworICAgICAgICAgICAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IGpzRXZlbnQgPSBnbG9iYWwtPkdldCh2ODo6U3RyaW5nOjpOZXdTeW1ib2woImV2 ZW50IikpOworICAgICAgICAgICAgaWYgKFY4RE9NV3JhcHBlcjo6aXNWYWxpZERPTU9iamVjdChq c0V2ZW50KSkKKyAgICAgICAgICAgICAgICBldmVudElkID0gKHVuc2lnbmVkIGxvbmcgbG9uZykg VjhFdmVudDo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChqc0V2ZW50KSk7 CisgICAgICAgIH0KKyAgICB9CisgICAgYWN0aXZlLT5sb2FkZXIoKS0+Y2xpZW50KCktPmxvZ0Ny b3NzRnJhbWVQcm9wZXJ0eUFjY2Vzcyh0YXJnZXQsIGNyb3NzU2l0ZSwgcHJvcE5hbWUsIGV2ZW50 SWQpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4VXRpbGl0aWVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0 aWxpdGllcy5oCShyZXZpc2lvbiA1Njc5OSkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGls aXRpZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNTYsNiArNTYsOCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBnZXRTY3JpcHRFeGVjdXRpb25Db250 ZXh0KCk7CiAKKyAgICB2b2lkIGxvZ1Byb3BlcnR5QWNjZXNzKHY4OjpMb2NhbDx2ODo6U3RyaW5n PiBuYW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKTsKKwogICAgIGNsYXNzIEFsbG93 QWxsb2NhdGlvbiB7CiAgICAgcHVibGljOgogICAgICAgICBpbmxpbmUgQWxsb3dBbGxvY2F0aW9u KCkKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAkocmV2aXNpb24gNTY3OTkpCisr KyBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0y NDQsNiArMjQ0LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIHZvaWQg ZGlkQ3JlYXRlU2NyaXB0Q29udGV4dEZvckZyYW1lKCkgPSAwOwogICAgICAgICB2aXJ0dWFsIHZv aWQgZGlkRGVzdHJveVNjcmlwdENvbnRleHRGb3JGcmFtZSgpID0gMDsKICAgICAgICAgdmlydHVh bCB2b2lkIGRpZENyZWF0ZUlzb2xhdGVkU2NyaXB0Q29udGV4dCgpID0gMDsKKworICAgICAgICB2 aXJ0dWFsIHZvaWQgbG9nQ3Jvc3NGcmFtZVByb3BlcnR5QWNjZXNzKEZyYW1lKiB0YXJnZXQsIGJv b2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFN0cmluZyYgbmFtZSwgdW5zaWduZWQgbG9uZyBsb25nIGV2 ZW50SWQpIHsgfQogI2VuZGlmCiAKICAgICAgICAgdmlydHVhbCB2b2lkIHJlZ2lzdGVyRm9ySWNv bk5vdGlmaWNhdGlvbihib29sIGxpc3RlbiA9IHRydWUpID0gMDsKSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwko cmV2aXNpb24gNTY4MDApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDMtMzAgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW2Nocm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3Nl cyBmb3Igc2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM1NzczCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVDbGllbnQuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmRpZE1ha2VDcm9zc0ZyYW1lQWNjZXNz KToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpsb2dDcm9zc0ZyYW1lUHJvcGVydHlBY2Nlc3Mp OgorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuaDoKKwogMjAxMC0wMy0zMCAg Sm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBKZXJlbXkgT3Jsb3cuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1l Q2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNs aWVudC5oCShyZXZpc2lvbiA1Njc5OSkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJh bWVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjg0LDYgKzI4NCw5IEBAIHB1YmxpYzoKICAg ICAvLyBzY3JpcHRzLgogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVJc29sYXRlZFNjcmlwdENv bnRleHQoV2ViRnJhbWUqKSB7IH0KIAorICAgIC8vIE5vdGlmaWVzIHRoYXQgYSBjcm9zcy1mcmFt ZSBhY2Nlc3Mgd2FzIG1hZGUuCisgICAgdmlydHVhbCB2b2lkIGRpZE1ha2VDcm9zc0ZyYW1lQWNj ZXNzKFdlYkZyYW1lKiBhY3RpdmUsIFdlYkZyYW1lKiB0YXJnZXQsIGJvb2wgY3Jvc3NPcmlnaW4s IGNvbnN0IFdlYlN0cmluZyYgcHJvcGVydHksIHVuc2lnbmVkIGxvbmcgbG9uZyBldmVudElkKSB7 IH0KKwogCiAgICAgLy8gR2VvbWV0cnkgbm90aWZpY2F0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMv RnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDU2Nzk5KQorKysgV2ViS2l0 L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNTA1LDQgKzE1MDUsOSBAQCBQYXNzT3duUHRyPFdlYlBsdWdpbkxvYWRPYnNlcnZlcj4gRnJh bWVMCiAgICAgcmV0dXJuIGRzLT5yZWxlYXNlUGx1Z2luTG9hZE9ic2VydmVyKCk7CiB9CiAKK3Zv aWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpsb2dDcm9zc0ZyYW1lUHJvcGVydHlBY2Nlc3MoRnJh bWUqIHRhcmdldCwgYm9vbCBjcm9zc09yaWdpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCB1bnNpZ25l ZCBsb25nIGxvbmcgZXZlbnRJZCkKK3sKKyAgICBtX3dlYkZyYW1lLT5jbGllbnQoKS0+ZGlkTWFr ZUNyb3NzRnJhbWVBY2Nlc3MobV93ZWJGcmFtZSwgV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUodGFy Z2V0KSwgY3Jvc3NPcmlnaW4sIG5hbWUsIGV2ZW50SWQpOworfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwu aAkocmV2aXNpb24gNTY3OTkpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xp ZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTksNiArMTk5LDEyIEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIHZvaWQgZGlkTm90QWxsb3dTY3JpcHQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlk Tm90QWxsb3dQbHVnaW5zKCk7CiAKKyAgICB2aXJ0dWFsIHZvaWQgbG9nQ3Jvc3NGcmFtZVByb3Bl cnR5QWNjZXNzKAorICAgICAgICBXZWJDb3JlOjpGcmFtZSogdGFyZ2V0LAorICAgICAgICBib29s IGNyb3NzT3JpZ2luLAorICAgICAgICBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG5hbWUsCisgICAg ICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBldmVudElkKTsKKwogcHJpdmF0ZToKICAgICB2b2lkIG1h a2VEb2N1bWVudFZpZXcoKTsKIAo= 52079 2010-03-30 14:14:33 -0700 2010-06-11 10:40:35 -0700 patch with rename and reinterpret_cast 0330siteisolation_b.diff text/plain 7909 johnnyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjgwNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDMtMzAgIEpvaG4gR3JlZ2cgIDxqb2hubnlnQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBhZGQgbG9nZ2luZyBvZiBjcm9zcy1mcmFtZSBwcm9wZXJ0eSBhY2Nlc3NlcyBmb3Ig c2l0ZSBpc29sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzczCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIG5vIG5ldyBmdW5jdGlvbmFs aXR5LgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06Cisg ICAgICAgICogYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 bG9nUHJvcGVydHlBY2Nlc3MpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmg6 CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudDo6bG9nQ3Jvc3NGcmFtZVByb3BlcnR5QWNjZXNzKToKKwogMjAx MC0wMy0zMCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yVjgucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JWOC5wbQkocmV2aXNpb24gNTY3OTkpCisrKyBXZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCSh3b3JraW5nIGNvcHkpCkBAIC02NzQsNiArNjc0 LDExIEBAIEVORAogICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIGlmICghVjhC aW5kaW5nU2VjdXJpdHk6OmNoZWNrTm9kZVNlY3VyaXR5KFY4QmluZGluZ1N0YXRlOjpPbmx5KCks IGltcC0+JGF0dHJOYW1lKCkpKSByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7XG5cbiIp OwogICAgIH0gZWxzaWYgKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVz LT57IkNoZWNrRnJhbWVTZWN1cml0eSJ9KSB7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVj bHMsICIgICAgaWYgKCFWOEJpbmRpbmdTZWN1cml0eTo6Y2hlY2tOb2RlU2VjdXJpdHkoVjhCaW5k aW5nU3RhdGU6Ok9ubHkoKSwgaW1wLT5jb250ZW50RG9jdW1lbnQoKSkpIHJldHVybiB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4oKTtcblxuIik7CisgICAgfSAKKworICAgIGlmICgkYXR0ckV4dC0+eyJE b05vdENoZWNrRG9tYWluU2VjdXJpdHkifSB8fCAKKyAgICAgICAgJGF0dHJFeHQtPnsiRG9Ob3RD aGVja0RvbWFpblNlY3VyaXR5T25HZXQifSkgeworICAgICAgICBwdXNoKEBpbXBsQ29udGVudERl Y2xzLCAiICAgIGxvZ1Byb3BlcnR5QWNjZXNzKG5hbWUsIGluZm8pO1xuIik7CiAgICAgfQogCiAg ICAgbXkgJHVzZUV4Y2VwdGlvbnMgPSAxIGlmIEB7JGF0dHJpYnV0ZS0+Z2V0dGVyRXhjZXB0aW9u c30gYW5kICEoJGlzUG9kVHlwZSk7CkBAIC0xNDQ2LDYgKzE0NTEsNyBAQCBzdWIgR2VuZXJhdGVJ bXBsZW1lbnRhdGlvbgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhCaW5kaW5nLmhcIlxuIiAuCiAg ICAgICAgICAiI2luY2x1ZGUgXCJWOEJpbmRpbmdTdGF0ZS5oXCJcbiIgLgogICAgICAgICAgIiNp bmNsdWRlIFwiVjhET01XcmFwcGVyLmhcIlxuIiAuCisgICAgICAgICAiI2luY2x1ZGUgXCJWOFV0 aWxpdGllcy5oXCJcbiIgLgogICAgICAgICAgIiNpbmNsdWRlIFwiVjhJc29sYXRlZENvbnRleHQu aFwiXG5cbiIgLgogICAgICAgICAgIiN1bmRlZiBMT0dcblxuIik7CiAKSW5kZXg6IFdlYkNvcmUv YmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGlu Z3MvdjgvVjhVdGlsaXRpZXMuY3BwCShyZXZpc2lvbiA1Njc5OSkKKysrIFdlYkNvcmUvYmluZGlu Z3MvdjgvVjhVdGlsaXRpZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMywxMSArMzMsMTUgQEAK IAogI2luY2x1ZGUgPHY4Lmg+CiAKKyNpbmNsdWRlICJDaHJvbWl1bUJyaWRnZS5oIgogI2luY2x1 ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRlICJGcmFtZUxvYWRl ckNsaWVudC5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKICNpbmNsdWRl ICJTY3JpcHRTdGF0ZS5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgorI2luY2x1ZGUgIlY4Qmlu ZGluZ1N0YXRlLmgiCisjaW5jbHVkZSAiVjhET01XaW5kb3cuaCIKICNpbmNsdWRlICJWOFByb3h5 LmgiCiAjaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIgogI2luY2x1ZGUgIldvcmtlckNvbnRleHRF eGVjdXRpb25Qcm94eS5oIgpAQCAtMTQyLDQgKzE0NiwzMCBAQCBTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiBnZXRTY3JpcHRFeGVjdXRpCiAgICAgcmV0dXJuIDA7CiB9CiAKK3ZvaWQgbG9nUHJvcGVy dHlBY2Nlc3Modjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nlc3Nvcklu Zm8mIGluZm8pCit7CisgICAgRnJhbWUqIHRhcmdldCA9IFY4RE9NV2luZG93Ojp0b05hdGl2ZShp bmZvLkhvbGRlcigpKS0+ZnJhbWUoKTsKKyAgICBGcmFtZSogYWN0aXZlID0gVjhCaW5kaW5nU3Rh dGU6Ok9ubHkoKS0+Z2V0QWN0aXZlV2luZG93KCktPmZyYW1lKCk7CisgICAgaWYgKHRhcmdldCA9 PSBhY3RpdmUpCisgICAgICAgIHJldHVybjsKKworICAgIGJvb2wgY3Jvc3NTaXRlID0gIVY4Qmlu ZGluZ1NlY3VyaXR5OjpjYW5BY2Nlc3NGcmFtZShWOEJpbmRpbmdTdGF0ZTo6T25seSgpLCB0YXJn ZXQsIGZhbHNlKTsKKyAgICBTdHJpbmcgcHJvcE5hbWUgPSB0b1dlYkNvcmVTdHJpbmcobmFtZSk7 CisKKyAgICAvLyBGb3IgY3Jvc3Mtc2l0ZSwgd2UgYWxzbyB3YW50IHRvIGlkZW50aWZ5IHRoZSBj dXJyZW50IGV2ZW50IHRvIHJlY29yZCByZXBlYXQgYWNjZXNzZXMuCisgICAgdW5zaWduZWQgbG9u ZyBsb25nIGV2ZW50SWQgPSAwOworICAgIGlmIChjcm9zc1NpdGUpIHsKKyAgICAgICAgdjg6Okhh bmRsZVNjb3BlIGhhbmRsZVNjb3BlOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB2 OENvbnRleHQgPSBWOFByb3h5OjptYWluV29ybGRDb250ZXh0KGFjdGl2ZSk7CisgICAgICAgIGlm ICghdjhDb250ZXh0LklzRW1wdHkoKSkgeworICAgICAgICAgICAgdjg6OkNvbnRleHQ6OlNjb3Bl IHNjb3BlKHY4Q29udGV4dCk7CisgICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGds b2JhbCA9IHY4Q29udGV4dC0+R2xvYmFsKCk7CisgICAgICAgICAgICB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4ganNFdmVudCA9IGdsb2JhbC0+R2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiZXZlbnQi KSk7CisgICAgICAgICAgICBpZiAoVjhET01XcmFwcGVyOjppc1ZhbGlkRE9NT2JqZWN0KGpzRXZl bnQpKQorICAgICAgICAgICAgICAgIGV2ZW50SWQgPSByZWludGVycHJldF9jYXN0PHVuc2lnbmVk IGxvbmcgbG9uZz4oVjhFdmVudDo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2Fz dChqc0V2ZW50KSkpOworICAgICAgICB9CisgICAgfQorICAgIGFjdGl2ZS0+bG9hZGVyKCktPmNs aWVudCgpLT5sb2dDcm9zc0ZyYW1lUHJvcGVydHlBY2Nlc3ModGFyZ2V0LCBjcm9zc1NpdGUsIHBy b3BOYW1lLCBldmVudElkKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2Vi Q29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmlu ZGluZ3MvdjgvVjhVdGlsaXRpZXMuaAkocmV2aXNpb24gNTY3OTkpCisrKyBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4VXRpbGl0aWVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogZ2V0U2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpOwogCisgICAgdm9pZCBsb2dQcm9wZXJ0eUFjY2Vzcyh2ODo6TG9j YWw8djg6OlN0cmluZz4gbmFtZSwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbyk7CisKICAg ICBjbGFzcyBBbGxvd0FsbG9jYXRpb24gewogICAgIHB1YmxpYzoKICAgICAgICAgaW5saW5lIEFs bG93QWxsb2NhdGlvbigpCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlz aW9uIDU2Nzk5KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjQ0LDYgKzI0NCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg dmlydHVhbCB2b2lkIGRpZENyZWF0ZVNjcmlwdENvbnRleHRGb3JGcmFtZSgpID0gMDsKICAgICAg ICAgdmlydHVhbCB2b2lkIGRpZERlc3Ryb3lTY3JpcHRDb250ZXh0Rm9yRnJhbWUoKSA9IDA7CiAg ICAgICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVJc29sYXRlZFNjcmlwdENvbnRleHQoKSA9IDA7 CisKKyAgICAgICAgdmlydHVhbCB2b2lkIGxvZ0Nyb3NzRnJhbWVQcm9wZXJ0eUFjY2VzcyhGcmFt ZSogdGFyZ2V0LCBib29sIGNyb3NzT3JpZ2luLCBjb25zdCBTdHJpbmcmIG5hbWUsIHVuc2lnbmVk IGxvbmcgbG9uZyBldmVudElkKSB7IH0KICNlbmRpZgogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBy ZWdpc3RlckZvckljb25Ob3RpZmljYXRpb24oYm9vbCBsaXN0ZW4gPSB0cnVlKSA9IDA7CkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU2ODAwKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAzLTMwICBKb2huIEdyZWdn ICA8am9obm55Z0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gYWRkIGxvZ2dpbmcgb2YgY3Jvc3MtZnJhbWUgcHJv cGVydHkgYWNjZXNzZXMgZm9yIHNpdGUgaXNvbGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTc3MworCisgICAgICAgICogcHVibGljL1dlYkZy YW1lQ2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50Ojpsb2dDcm9zc0Zy YW1lUHJvcGVydHlBY2Nlc3MpOgorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OmxvZ0Nyb3NzRnJh bWVQcm9wZXJ0eUFjY2Vzcyk6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5o OgorCiAyMDEwLTAzLTMwICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4KSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkZyYW1lQ2xpZW50LmgJKHJldmlzaW9uIDU2Nzk5KQorKysgV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODQsNiArMjg0 LDEwIEBAIHB1YmxpYzoKICAgICAvLyBzY3JpcHRzLgogICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVh dGVJc29sYXRlZFNjcmlwdENvbnRleHQoV2ViRnJhbWUqKSB7IH0KIAorICAgIC8vIE5vdGlmaWVz IHRoYXQgYSBjcm9zcy1mcmFtZSBhY2Nlc3Mgd2FzIG1hZGUgdG8gYSBwcm9wZXJ0eSB0aGF0IGFs bG93cworICAgIC8vIGNyb3NzLW9yaWdpbiBhY2Nlc3MuCisgICAgdmlydHVhbCB2b2lkIGxvZ0Ny b3NzRnJhbWVQcm9wZXJ0eUFjY2VzcyhXZWJGcmFtZSogYWN0aXZlLCBXZWJGcmFtZSogdGFyZ2V0 LCBib29sIGNyb3NzT3JpZ2luLCBjb25zdCBXZWJTdHJpbmcmIHByb3BlcnR5LCB1bnNpZ25lZCBs b25nIGxvbmcgZXZlbnRJZCkgeyB9CisKIAogICAgIC8vIEdlb21ldHJ5IG5vdGlmaWNhdGlvbnMg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCShyZXZpc2lv biA1Njc5OSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTUwNSw0ICsxNTA1LDkgQEAgUGFzc093blB0cjxXZWJQbHVn aW5Mb2FkT2JzZXJ2ZXI+IEZyYW1lTAogICAgIHJldHVybiBkcy0+cmVsZWFzZVBsdWdpbkxvYWRP YnNlcnZlcigpOwogfQogCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6bG9nQ3Jvc3NGcmFt ZVByb3BlcnR5QWNjZXNzKEZyYW1lKiB0YXJnZXQsIGJvb2wgY3Jvc3NPcmlnaW4sIGNvbnN0IFN0 cmluZyYgbmFtZSwgdW5zaWduZWQgbG9uZyBsb25nIGV2ZW50SWQpCit7CisgICAgbV93ZWJGcmFt ZS0+Y2xpZW50KCktPmxvZ0Nyb3NzRnJhbWVQcm9wZXJ0eUFjY2VzcyhtX3dlYkZyYW1lLCBXZWJG cmFtZUltcGw6OmZyb21GcmFtZSh0YXJnZXQpLCBjcm9zc09yaWdpbiwgbmFtZSwgZXZlbnRJZCk7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9G cmFtZUxvYWRlckNsaWVudEltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3Jj L0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5oCShyZXZpc2lvbiA1Njc5OSkKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE5OSw2 ICsxOTksMTIgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWROb3RBbGxvd1NjcmlwdCgp OwogICAgIHZpcnR1YWwgdm9pZCBkaWROb3RBbGxvd1BsdWdpbnMoKTsKIAorICAgIHZpcnR1YWwg dm9pZCBsb2dDcm9zc0ZyYW1lUHJvcGVydHlBY2Nlc3MoCisgICAgICAgIFdlYkNvcmU6OkZyYW1l KiB0YXJnZXQsCisgICAgICAgIGJvb2wgY3Jvc3NPcmlnaW4sCisgICAgICAgIGNvbnN0IFdlYkNv cmU6OlN0cmluZyYgbmFtZSwKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIGV2ZW50SWQpOwor CiBwcml2YXRlOgogICAgIHZvaWQgbWFrZURvY3VtZW50VmlldygpOwogCg==