36595 2010-03-25 06:58:51 -0700 Forward DatabaseTracker::canEstablishDatabase to chromium layer. 2010-03-29 16:53:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 jochen jochen atwilson commit-queue dimich fishd jorlow levin michaeln webkit.review.bot oldest_to_newest 204023 0 jochen 2010-03-25 06:58:51 -0700 Forward DatabaseTracker::canEstablishDatabase to chromium layer. 204024 1 51633 jochen 2010-03-25 06:59:29 -0700 Created attachment 51633 Patch 204027 2 webkit.review.bot 2010-03-25 07:03:43 -0700 Attachment 51633 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/chromium/src/DatabaseObserver.cpp:54: An else statement can be removed when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 204031 3 51633 jorlow 2010-03-25 07:07:38 -0700 Comment on attachment 51633 Patch r+ from me, but leaving it r? for now to give some others a chance to chime in. > diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h > index c6f51b6..5ffc2e3 100644 > --- a/WebKit/chromium/public/WebFrameClient.h > +++ b/WebKit/chromium/public/WebFrameClient.h > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2009 Google Inc. All rights reserved. > + * Copyright (C) 2010 Google Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions are > @@ -263,6 +263,9 @@ public: > // Controls whether scripts are allowed to execute for this frame. > virtual bool allowScript(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; } > > + // Controls whether access to Web Databases is allowed for this frame. > + virtual bool allowDatabase(const WebSecurityOrigin&, const WebString&, const WebString&, unsigned long) { return true; } If anything, I'd probably default this to false...but do what you think is best. > + > // Notifies the client that the frame would have executed script if script were enabled. > virtual void didNotAllowScript(WebFrame*) { } > > diff --git a/WebKit/chromium/src/DatabaseObserver.cpp b/WebKit/chromium/src/DatabaseObserver.cpp > index 54e93e1..1f13351 100644 > --- a/WebKit/chromium/src/DatabaseObserver.cpp > +++ b/WebKit/chromium/src/DatabaseObserver.cpp > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2009 Google Inc. All rights reserved. > + * Copyright (C) 2010 Google Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions are > @@ -32,13 +32,37 @@ > #include "DatabaseObserver.h" > > #include "Database.h" > +#include "Document.h" > +#include "ScriptExecutionContext.h" > #include "WebDatabase.h" > #include "WebDatabaseObserver.h" > +#include "WebFrameClient.h" > +#include "WebFrameImpl.h" > +#include "WebSecurityOrigin.h" > +#include "WebWorkerImpl.h" > +#include "WorkerContext.h" > +#include "WorkerThread.h" > > using namespace WebKit; > > namespace WebCore { > > +bool DatabaseObserver::canEstablishDatabase(ScriptExecutionContext* scriptExecutionContext, const String& name, const String& displayName, unsigned long estimatedSize) > +{ > + ASSERT(isMainThread()); > + ASSERT(scriptExecutionContext->isDocument() || scriptExecutionContext->isWorkerContext()); > + if (scriptExecutionContext->isDocument()) { > + Document* document = static_cast<Document*>(scriptExecutionContext); > + WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame()); > + return webFrame->client()->allowDatabase(WebSecurityOrigin(scriptExecutionContext->securityOrigin()), name, displayName, estimatedSize); > + } else { > + WorkerContext* worker = static_cast<WorkerContext*>(scriptExecutionContext); > + WorkerLoaderProxy* workerLoaderProxy = &worker->thread()->workerLoaderProxy(); > + WebWorkerImpl* webWorker = reinterpret_cast<WebWorkerImpl*>(workerLoaderProxy); > + return webWorker->allowDatabase(WebSecurityOrigin(scriptExecutionContext->securityOrigin()), name, displayName, estimatedSize); > + } I don't know for sure whether this is the proper way to do this. Seems plausible tho. > +} > + > void DatabaseObserver::databaseOpened(Database* database) > { > ASSERT(isMainThread()); > diff --git a/WebKit/chromium/src/WebWorkerBase.h b/WebKit/chromium/src/WebWorkerBase.h > index 0217401..c50d4a3 100644 > --- a/WebKit/chromium/src/WebWorkerBase.h > +++ b/WebKit/chromium/src/WebWorkerBase.h > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2009 Google Inc. All rights reserved. > + * Copyright (C) 2010 Google Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions are > @@ -45,8 +45,11 @@ class WorkerThread; > > namespace WebKit { > class WebCommonWorkerClient; > +class WebSecurityOrigin; > +class WebString; > class WebURL; > class WebView; > +class WebWorker; > class WebWorkerClient; > > // Base class for WebSharedWorkerImpl and WebWorkerImpl. It contains common > @@ -77,6 +80,9 @@ public: > virtual void postTaskForModeToWorkerContext( > PassOwnPtr<WebCore::ScriptExecutionContext::Task>, const WebCore::String& mode); > > + // Controls whether access to Web Databases is allowed for this worker. > + virtual bool allowDatabase(const WebSecurityOrigin&, const WebString&, const WebString&, unsigned long) { return true; } If anything, I'd probably default this to false...but do what you think is best. > + > // Executes the given task on the main thread. > static void dispatchTaskToMainThread(PassOwnPtr<WebCore::ScriptExecutionContext::Task>); > 204053 4 jochen 2010-03-25 07:42:07 -0700 (In reply to comment #2) > Attachment 51633 [details] did not pass style-queue: > > Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 > WebKit/chromium/src/DatabaseObserver.cpp:54: An else statement can be removed > when the prior "if" concludes with a return, break, continue or goto statement. > [readability/control_flow] [4] > Total errors found: 1 in 7 files > > > If any of these errors are false positives, please file a bug against > check-webkit-style. it looks so much better this way! 204055 5 jochen 2010-03-25 07:44:03 -0700 (In reply to comment #3) > (From update of attachment 51633 [details]) > r+ from me, but leaving it r? for now to give some others a chance to chime in. > > > diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h > > index c6f51b6..5ffc2e3 100644 > > --- a/WebKit/chromium/public/WebFrameClient.h > > +++ b/WebKit/chromium/public/WebFrameClient.h > > @@ -1,5 +1,5 @@ > > /* > > - * Copyright (C) 2009 Google Inc. All rights reserved. > > + * Copyright (C) 2010 Google Inc. All rights reserved. > > * > > * Redistribution and use in source and binary forms, with or without > > * modification, are permitted provided that the following conditions are > > @@ -263,6 +263,9 @@ public: > > // Controls whether scripts are allowed to execute for this frame. > > virtual bool allowScript(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; } > > > > + // Controls whether access to Web Databases is allowed for this frame. > > + virtual bool allowDatabase(const WebSecurityOrigin&, const WebString&, const WebString&, unsigned long) { return true; } > > If anything, I'd probably default this to false...but do what you think is > best. The old implementation would return true - this way, other embedders using the chromium layer won't get bidden by changed behavior. > > > + > > // Notifies the client that the frame would have executed script if script were enabled. > > virtual void didNotAllowScript(WebFrame*) { } > > > > diff --git a/WebKit/chromium/src/DatabaseObserver.cpp b/WebKit/chromium/src/DatabaseObserver.cpp > > index 54e93e1..1f13351 100644 > > --- a/WebKit/chromium/src/DatabaseObserver.cpp > > +++ b/WebKit/chromium/src/DatabaseObserver.cpp > > @@ -1,5 +1,5 @@ > > /* > > - * Copyright (C) 2009 Google Inc. All rights reserved. > > + * Copyright (C) 2010 Google Inc. All rights reserved. > > * > > * Redistribution and use in source and binary forms, with or without > > * modification, are permitted provided that the following conditions are > > @@ -32,13 +32,37 @@ > > #include "DatabaseObserver.h" > > > > #include "Database.h" > > +#include "Document.h" > > +#include "ScriptExecutionContext.h" > > #include "WebDatabase.h" > > #include "WebDatabaseObserver.h" > > +#include "WebFrameClient.h" > > +#include "WebFrameImpl.h" > > +#include "WebSecurityOrigin.h" > > +#include "WebWorkerImpl.h" > > +#include "WorkerContext.h" > > +#include "WorkerThread.h" > > > > using namespace WebKit; > > > > namespace WebCore { > > > > +bool DatabaseObserver::canEstablishDatabase(ScriptExecutionContext* scriptExecutionContext, const String& name, const String& displayName, unsigned long estimatedSize) > > +{ > > + ASSERT(isMainThread()); > > + ASSERT(scriptExecutionContext->isDocument() || scriptExecutionContext->isWorkerContext()); > > + if (scriptExecutionContext->isDocument()) { > > + Document* document = static_cast<Document*>(scriptExecutionContext); > > + WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame()); > > + return webFrame->client()->allowDatabase(WebSecurityOrigin(scriptExecutionContext->securityOrigin()), name, displayName, estimatedSize); > > + } else { > > + WorkerContext* worker = static_cast<WorkerContext*>(scriptExecutionContext); > > + WorkerLoaderProxy* workerLoaderProxy = &worker->thread()->workerLoaderProxy(); > > + WebWorkerImpl* webWorker = reinterpret_cast<WebWorkerImpl*>(workerLoaderProxy); > > + return webWorker->allowDatabase(WebSecurityOrigin(scriptExecutionContext->securityOrigin()), name, displayName, estimatedSize); > > + } > > I don't know for sure whether this is the proper way to do this. Seems > plausible tho. I've copied this more or less from WebWorkerClientImpl::createWorkerContextProxy > > > +} > > + > > void DatabaseObserver::databaseOpened(Database* database) > > { > > ASSERT(isMainThread()); > > diff --git a/WebKit/chromium/src/WebWorkerBase.h b/WebKit/chromium/src/WebWorkerBase.h > > index 0217401..c50d4a3 100644 > > --- a/WebKit/chromium/src/WebWorkerBase.h > > +++ b/WebKit/chromium/src/WebWorkerBase.h > > @@ -1,5 +1,5 @@ > > /* > > - * Copyright (C) 2009 Google Inc. All rights reserved. > > + * Copyright (C) 2010 Google Inc. All rights reserved. > > * > > * Redistribution and use in source and binary forms, with or without > > * modification, are permitted provided that the following conditions are > > @@ -45,8 +45,11 @@ class WorkerThread; > > > > namespace WebKit { > > class WebCommonWorkerClient; > > +class WebSecurityOrigin; > > +class WebString; > > class WebURL; > > class WebView; > > +class WebWorker; > > class WebWorkerClient; > > > > // Base class for WebSharedWorkerImpl and WebWorkerImpl. It contains common > > @@ -77,6 +80,9 @@ public: > > virtual void postTaskForModeToWorkerContext( > > PassOwnPtr<WebCore::ScriptExecutionContext::Task>, const WebCore::String& mode); > > > > + // Controls whether access to Web Databases is allowed for this worker. > > + virtual bool allowDatabase(const WebSecurityOrigin&, const WebString&, const WebString&, unsigned long) { return true; } > > If anything, I'd probably default this to false...but do what you think is > best. > > > + > > // Executes the given task on the main thread. > > static void dispatchTaskToMainThread(PassOwnPtr<WebCore::ScriptExecutionContext::Task>); > > 204061 6 51633 jorlow 2010-03-25 07:52:20 -0700 Comment on attachment 51633 Patch Oh, well assuming the createWorkerContextProxy code is correct, this should be fine too. I wonder if it should be factored out so it can be shared, but it seems different enough and they're in different layers that it's probably OK to leave it. r=me 204076 7 51633 commit-queue 2010-03-25 08:25:49 -0700 Comment on attachment 51633 Patch Clearing flags on attachment: 51633 Committed r56548: <http://trac.webkit.org/changeset/56548> 204077 8 commit-queue 2010-03-25 08:25:54 -0700 All reviewed patches have been landed. Closing bug. 204163 9 atwilson 2010-03-25 11:28:04 -0700 (In reply to comment #8) > All reviewed patches have been landed. Closing bug. BTW, I suspect that calling ASSERT(isMainThread()) from DatabaseObserver::canEstablishDatabase() will fail when invoked from worker context. So you'll probably need to remove that assertion. 204372 10 michaeln 2010-03-25 18:41:55 -0700 > BTW, I suspect that calling ASSERT(isMainThread()) from > DatabaseObserver::canEstablishDatabase() will fail when invoked from worker > context. So you'll probably need to remove that assertion. What you probably want here is... ASSERT(scriptContext->isContextThread()); 204868 11 51633 fishd 2010-03-26 16:56:33 -0700 Comment on attachment 51633 Patch > +++ b/WebKit/chromium/public/WebFrameClient.h > virtual bool allowScript(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; } > > + // Controls whether access to Web Databases is allowed for this frame. > + virtual bool allowDatabase(const WebSecurityOrigin&, const WebString&, const WebString&, unsigned long) { return true; } Every method of this interface must start with a WebFrame pointer. Given a WebFrame pointer, you can get the security origin, so there is no need for the WebSecurityOrigin parameter. The WebString and 'unsigned long' parameters should be named since there is no telling from this file what they might mean. It is important to document the WebKit API and to do that we leverage self-documenting variable names whenever possible. 205374 12 jorlow 2010-03-29 03:23:01 -0700 Re-opening to reflect the fact that Darin has provided additional comments on this. 205401 13 jochen 2010-03-29 04:26:27 -0700 (In reply to comment #12) > Re-opening to reflect the fact that Darin has provided additional comments on > this. I've opened #36743 for this. 205743 14 51633 atwilson 2010-03-29 16:53:47 -0700 Comment on attachment 51633 Patch > > + WebWorkerImpl* webWorker = reinterpret_cast<WebWorkerImpl*>(workerLoaderProxy); I think this line should cast to WebWorkerBase, not WebWorkerImpl since technically the object could be a WebSharedWorkerImpl instead. 51633 2010-03-25 06:59:29 -0700 2010-03-29 16:53:47 -0700 Patch bug-36595-20100325145927.patch text/plain 8231 jochen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzg3MmJmNC4uYjg0ZDQ1NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wMy0yNSAgSm9jaGVuIEVpc2lu Z2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGb3J3YXJkIERhdGFiYXNlVHJhY2tlcjo6Y2FuRXN0YWJsaXNo RGF0YWJhc2UgdG8gY2hyb21pdW0gbGF5ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zNjU5NQorCisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9E YXRhYmFzZU9ic2VydmVyLmg6CisgICAgICAgICogc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZVRy YWNrZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmNh bkVzdGFibGlzaERhdGFiYXNlKToKKwogMjAxMC0wMy0yNCAgRG1pdHJ5IFRpdG92ICA8ZGltaWNo QGNocm9taXVtLm9yZz4KIAogICAgICAgICBObyByZXZpZXcsIHJvbGxpbmcgb3V0IHI1NjQ1My4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZU9ic2VydmVyLmgg Yi9XZWJDb3JlL3N0b3JhZ2UvY2hyb21pdW0vRGF0YWJhc2VPYnNlcnZlci5oCmluZGV4IDUzNWMw ZDIuLjRlMjY2YzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFz ZU9ic2VydmVyLmgKKysrIGIvV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL0RhdGFiYXNlT2JzZXJ2 ZXIuaApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFy ZQpAQCAtMzQsMTEgKzM0LDE0IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIERhdGFi YXNlOworY2xhc3MgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDsKK2NsYXNzIFN0cmluZzsKIAogLy8g VGhlIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgY2xhc3MgaXMgaW4gdGhlIFdlYktpdCBBUEkgKENo cm9taXVtIHNvdXJjZSB0cmVlKQotLy8gaW4gd2Via2l0L2FwaS9zcmMvRGF0YWJhc2VPYnNlcnZl ci5jcHAuCisvLyBpbiBXZWJLaXQvY2hyb21pdW0vc3JjL0RhdGFiYXNlT2JzZXJ2ZXIuY3BwLgog Y2xhc3MgRGF0YWJhc2VPYnNlcnZlciB7CiBwdWJsaWM6CisgICAgc3RhdGljIGJvb2wgY2FuRXN0 YWJsaXNoRGF0YWJhc2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IFN0cmluZyYsIGNv bnN0IFN0cmluZyYsIHVuc2lnbmVkIGxvbmcpOwogICAgIHN0YXRpYyB2b2lkIGRhdGFiYXNlT3Bl bmVkKERhdGFiYXNlKik7CiAgICAgc3RhdGljIHZvaWQgZGF0YWJhc2VNb2RpZmllZChEYXRhYmFz ZSopOwogICAgIHN0YXRpYyB2b2lkIGRhdGFiYXNlQ2xvc2VkKERhdGFiYXNlKik7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3N0b3JhZ2UvY2hyb21pdW0vRGF0YWJhc2VUcmFja2VyQ2hyb21pdW0uY3Bw IGIvV2ViQ29yZS9zdG9yYWdlL2Nocm9taXVtL0RhdGFiYXNlVHJhY2tlckNocm9taXVtLmNwcApp bmRleCBhYzU4ZTA3Li4xMGI0OGZjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0b3JhZ2UvY2hyb21p dW0vRGF0YWJhc2VUcmFja2VyQ2hyb21pdW0uY3BwCisrKyBiL1dlYkNvcmUvc3RvcmFnZS9jaHJv bWl1bS9EYXRhYmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTU3LDExICs1Nyw5IEBAIERhdGFiYXNl VHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKCkKICAgICBTUUxpdGVGaWxlU3lzdGVtOjpyZWdpc3Rl clNRTGl0ZVZGUygpOwogfQogCi1ib29sIERhdGFiYXNlVHJhY2tlcjo6Y2FuRXN0YWJsaXNoRGF0 YWJhc2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmlu ZyYsIHVuc2lnbmVkIGxvbmcpCitib29sIERhdGFiYXNlVHJhY2tlcjo6Y2FuRXN0YWJsaXNoRGF0 YWJhc2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgY29u c3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25n IGVzdGltYXRlZFNpemUpCiB7Ci0gICAgLy8gSW4gQ2hyb21pdW0sIGEgZGF0YWJhc2UgY2FuIGFs d2F5cyBiZSBlc3RhYmxpc2hlZCAoZXZlbiB0aG91Z2ggd2UgbWlnaHQgbm90Ci0gICAgLy8gYmUg YWJsZSB0byB3cml0ZSBhbnl0aGluZyB0byBpdCBpZiB0aGUgcXVvdGEgZm9yIHRoaXMgb3JpZ2lu IHdhcyBleGNlZWRlZCkKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gRGF0YWJhc2VPYnNl cnZlcjo6Y2FuRXN0YWJsaXNoRGF0YWJhc2Uoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgbmFtZSwg ZGlzcGxheU5hbWUsIGVzdGltYXRlZFNpemUpOwogfQogCiB2b2lkIERhdGFiYXNlVHJhY2tlcjo6 c2V0RGF0YWJhc2VEZXRhaWxzKFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU3RyaW5nJiwgY29uc3Qg U3RyaW5nJiwgdW5zaWduZWQgbG9uZykKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGM1NjhkMTUuLjU2YjQ5NmMg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEwLTAzLTI1ICBKb2NoZW4gRWlzaW5n ZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZvcndhcmQgRGF0YWJhc2VUcmFja2VyOjpjYW5Fc3RhYmxpc2hE YXRhYmFzZSB0byBjaHJvbWl1bSBsYXllci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM2NTk1CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVDbGll bnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmFsbG93RGF0YWJhc2UpOgor ICAgICAgICAqIHNyYy9EYXRhYmFzZU9ic2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRh dGFiYXNlT2JzZXJ2ZXI6OmNhbkVzdGFibGlzaERhdGFiYXNlKToKKyAgICAgICAgKiBzcmMvV2Vi V29ya2VyQmFzZS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJXb3JrZXJCYXNlOjphbGxvd0RhdGFi YXNlKToKKwogMjAxMC0wMy0yNCAgRG1pdHJ5IFRpdG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4K IAogICAgICAgICBObyByZXZpZXcsIHJvbGxpbmcgb3V0IHI1NjQ1My4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRnJhbWVDbGllbnQuaAppbmRleCBjNmY1MWI2Li41ZmZjMmUzIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKKysrIGIvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv cHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0yNjMsNiArMjYzLDkgQEAgcHVibGljOgog ICAgIC8vIENvbnRyb2xzIHdoZXRoZXIgc2NyaXB0cyBhcmUgYWxsb3dlZCB0byBleGVjdXRlIGZv ciB0aGlzIGZyYW1lLgogICAgIHZpcnR1YWwgYm9vbCBhbGxvd1NjcmlwdChXZWJGcmFtZSosIGJv b2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVybiBlbmFibGVkUGVyU2V0dGluZ3M7IH0KIAor ICAgIC8vIENvbnRyb2xzIHdoZXRoZXIgYWNjZXNzIHRvIFdlYiBEYXRhYmFzZXMgaXMgYWxsb3dl ZCBmb3IgdGhpcyBmcmFtZS4KKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dEYXRhYmFzZShjb25zdCBX ZWJTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFdlYlN0cmluZyYsIGNvbnN0IFdlYlN0cmluZyYsIHVu c2lnbmVkIGxvbmcpIHsgcmV0dXJuIHRydWU7IH0KKwogICAgIC8vIE5vdGlmaWVzIHRoZSBjbGll bnQgdGhhdCB0aGUgZnJhbWUgd291bGQgaGF2ZSBleGVjdXRlZCBzY3JpcHQgaWYgc2NyaXB0IHdl cmUgZW5hYmxlZC4KICAgICB2aXJ0dWFsIHZvaWQgZGlkTm90QWxsb3dTY3JpcHQoV2ViRnJhbWUq KSB7IH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9EYXRhYmFzZU9ic2VydmVy LmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvRGF0YWJhc2VPYnNlcnZlci5jcHAKaW5kZXggNTRl OTNlMS4uMWYxMzM1MSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9EYXRhYmFzZU9i c2VydmVyLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0RhdGFiYXNlT2JzZXJ2ZXIuY3Bw CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBA IC0zMiwxMyArMzIsMzcgQEAKICNpbmNsdWRlICJEYXRhYmFzZU9ic2VydmVyLmgiCiAKICNpbmNs dWRlICJEYXRhYmFzZS5oIgorI2luY2x1ZGUgIkRvY3VtZW50LmgiCisjaW5jbHVkZSAiU2NyaXB0 RXhlY3V0aW9uQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkRhdGFiYXNlLmgiCiAjaW5jbHVkZSAi V2ViRGF0YWJhc2VPYnNlcnZlci5oIgorI2luY2x1ZGUgIldlYkZyYW1lQ2xpZW50LmgiCisjaW5j bHVkZSAiV2ViRnJhbWVJbXBsLmgiCisjaW5jbHVkZSAiV2ViU2VjdXJpdHlPcmlnaW4uaCIKKyNp bmNsdWRlICJXZWJXb3JrZXJJbXBsLmgiCisjaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIgorI2lu Y2x1ZGUgIldvcmtlclRocmVhZC5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKK2Jvb2wgRGF0YWJhc2VPYnNlcnZlcjo6Y2FuRXN0YWJsaXNoRGF0 YWJhc2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgY29u c3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25n IGVzdGltYXRlZFNpemUpCit7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NF UlQoc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+aXNEb2N1bWVudCgpIHx8IHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQtPmlzV29ya2VyQ29udGV4dCgpKTsKKyAgICBpZiAoc2NyaXB0RXhlY3V0aW9uQ29u dGV4dC0+aXNEb2N1bWVudCgpKSB7CisgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRp Y19jYXN0PERvY3VtZW50Kj4oc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CisgICAgICAgIFdlYkZy YW1lSW1wbCogd2ViRnJhbWUgPSBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShkb2N1bWVudC0+ZnJh bWUoKSk7CisgICAgICAgIHJldHVybiB3ZWJGcmFtZS0+Y2xpZW50KCktPmFsbG93RGF0YWJhc2Uo V2ViU2VjdXJpdHlPcmlnaW4oc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+c2VjdXJpdHlPcmlnaW4o KSksIG5hbWUsIGRpc3BsYXlOYW1lLCBlc3RpbWF0ZWRTaXplKTsKKyAgICB9IGVsc2UgeworICAg ICAgICBXb3JrZXJDb250ZXh0KiB3b3JrZXIgPSBzdGF0aWNfY2FzdDxXb3JrZXJDb250ZXh0Kj4o c2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CisgICAgICAgIFdvcmtlckxvYWRlclByb3h5KiB3b3Jr ZXJMb2FkZXJQcm94eSA9ICZ3b3JrZXItPnRocmVhZCgpLT53b3JrZXJMb2FkZXJQcm94eSgpOwor ICAgICAgICBXZWJXb3JrZXJJbXBsKiB3ZWJXb3JrZXIgPSByZWludGVycHJldF9jYXN0PFdlYldv cmtlckltcGwqPih3b3JrZXJMb2FkZXJQcm94eSk7CisgICAgICAgIHJldHVybiB3ZWJXb3JrZXIt PmFsbG93RGF0YWJhc2UoV2ViU2VjdXJpdHlPcmlnaW4oc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+ c2VjdXJpdHlPcmlnaW4oKSksIG5hbWUsIGRpc3BsYXlOYW1lLCBlc3RpbWF0ZWRTaXplKTsKKyAg ICB9Cit9CisKIHZvaWQgRGF0YWJhc2VPYnNlcnZlcjo6ZGF0YWJhc2VPcGVuZWQoRGF0YWJhc2Uq IGRhdGFiYXNlKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckJhc2UuaCBiL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViV29ya2VyQmFzZS5oCmluZGV4IDAyMTc0MDEuLmM1MGQ0YTMgMTAwNjQ0Ci0tLSBhL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViV29ya2VyQmFzZS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViV29ya2VyQmFzZS5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw OSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEw IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMgYXJlCkBAIC00NSw4ICs0NSwxMSBAQCBjbGFzcyBXb3JrZXJUaHJlYWQ7CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViQ29tbW9uV29ya2VyQ2xpZW50OworY2xhc3MgV2Vi U2VjdXJpdHlPcmlnaW47CitjbGFzcyBXZWJTdHJpbmc7CiBjbGFzcyBXZWJVUkw7CiBjbGFzcyBX ZWJWaWV3OworY2xhc3MgV2ViV29ya2VyOwogY2xhc3MgV2ViV29ya2VyQ2xpZW50OwogCiAvLyBC YXNlIGNsYXNzIGZvciBXZWJTaGFyZWRXb3JrZXJJbXBsIGFuZCBXZWJXb3JrZXJJbXBsLiBJdCBj b250YWlucyBjb21tb24KQEAgLTc3LDYgKzgwLDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCBwb3N0VGFza0Zvck1vZGVUb1dvcmtlckNvbnRleHQoCiAgICAgICAgIFBhc3NPd25QdHI8V2Vi Q29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzaz4sIGNvbnN0IFdlYkNvcmU6OlN0cmlu ZyYgbW9kZSk7CiAKKyAgICAvLyBDb250cm9scyB3aGV0aGVyIGFjY2VzcyB0byBXZWIgRGF0YWJh c2VzIGlzIGFsbG93ZWQgZm9yIHRoaXMgd29ya2VyLgorICAgIHZpcnR1YWwgYm9vbCBhbGxvd0Rh dGFiYXNlKGNvbnN0IFdlYlNlY3VyaXR5T3JpZ2luJiwgY29uc3QgV2ViU3RyaW5nJiwgY29uc3Qg V2ViU3RyaW5nJiwgdW5zaWduZWQgbG9uZykgeyByZXR1cm4gdHJ1ZTsgfQorCiAgICAgLy8gRXhl Y3V0ZXMgdGhlIGdpdmVuIHRhc2sgb24gdGhlIG1haW4gdGhyZWFkLgogICAgIHN0YXRpYyB2b2lk IGRpc3BhdGNoVGFza1RvTWFpblRocmVhZChQYXNzT3duUHRyPFdlYkNvcmU6OlNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ6OlRhc2s+KTsKIAo=