Title: [187830] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 187830
- Author
- [email protected]
- Date
- 2015-08-04 02:33:08 -0700 (Tue, 04 Aug 2015)
Log Message
Merge r186592 - REGRESSION (r182866): repeated prompts for password on internal Apple website using workers
https://bugs.webkit.org/show_bug.cgi?id=146769
Reviewed by Sam Weinig.
Not sure how to make a regression test for this. Sure would be nice to have one though.
* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions): Added. Calls through to the
base class copy constructor to copy data members of the base class (the lack of this was
the bug). Also initializes all the data members of this class.
(WebCore::ThreadableLoaderOptions::isolatedCopy): Changed to call the constructor above.
* loader/ThreadableLoader.h: Added new constructor.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (187829 => 187830)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-08-04 09:23:23 UTC (rev 187829)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-08-04 09:33:08 UTC (rev 187830)
@@ -1,3 +1,20 @@
+2015-07-09 Darin Adler <[email protected]>
+
+ REGRESSION (r182866): repeated prompts for password on internal Apple website using workers
+ https://bugs.webkit.org/show_bug.cgi?id=146769
+
+ Reviewed by Sam Weinig.
+
+ Not sure how to make a regression test for this. Sure would be nice to have one though.
+
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions): Added. Calls through to the
+ base class copy constructor to copy data members of the base class (the lack of this was
+ the bug). Also initializes all the data members of this class.
+ (WebCore::ThreadableLoaderOptions::isolatedCopy): Changed to call the constructor above.
+
+ * loader/ThreadableLoader.h: Added new constructor.
+
2015-07-08 Sungmann Cho <[email protected]>
[GTK] The "Missing Plug-in" buttons are not showing up on some flash contents.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp (187829 => 187830)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp 2015-08-04 09:23:23 UTC (rev 187829)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp 2015-08-04 09:33:08 UTC (rev 187830)
@@ -51,17 +51,28 @@
{
}
+ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions& baseOptions, PreflightPolicy preflightPolicy, CrossOriginRequestPolicy crossOriginRequestPolicy, RefPtr<SecurityOrigin>&& securityOrigin, String&& initiator)
+ : ResourceLoaderOptions(baseOptions)
+ , preflightPolicy(preflightPolicy)
+ , crossOriginRequestPolicy(crossOriginRequestPolicy)
+ , securityOrigin(WTF::move(securityOrigin))
+#if ENABLE(RESOURCE_TIMING)
+ , initiator(WTF::move(initiator))
+#endif
+{
+}
+
std::unique_ptr<ThreadableLoaderOptions> ThreadableLoaderOptions::isolatedCopy() const
{
- std::unique_ptr<ThreadableLoaderOptions> copy = std::make_unique<ThreadableLoaderOptions>();
- copy->preflightPolicy = preflightPolicy;
- copy->crossOriginRequestPolicy = crossOriginRequestPolicy;
+ RefPtr<SecurityOrigin> securityOriginCopy;
if (securityOrigin)
- copy->securityOrigin = securityOrigin->isolatedCopy();
+ securityOriginCopy = securityOrigin->isolatedCopy();
#if ENABLE(RESOURCE_TIMING)
- copy->initiator = initiator.isolatedCopy();
+ return std::make_unique<ThreadableLoaderOptions>(*this, preflightPolicy, crossOriginRequestPolicy,
+ WTF::move(securityOriginCopy), initiator.isolatedCopy());
+#else
+ return std::make_unique<ThreadableLoaderOptions>(*this, preflightPolicy, crossOriginRequestPolicy, WTF::move(securityOriginCopy), String());
#endif
- return copy;
}
PassRefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h (187829 => 187830)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h 2015-08-04 09:23:23 UTC (rev 187829)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h 2015-08-04 09:33:08 UTC (rev 187830)
@@ -62,8 +62,9 @@
PreventPreflight
};
- struct ThreadableLoaderOptions : public ResourceLoaderOptions {
+ struct ThreadableLoaderOptions : ResourceLoaderOptions {
ThreadableLoaderOptions();
+ ThreadableLoaderOptions(const ResourceLoaderOptions&, PreflightPolicy, CrossOriginRequestPolicy, RefPtr<SecurityOrigin>&&, String&& initiator);
~ThreadableLoaderOptions();
std::unique_ptr<ThreadableLoaderOptions> isolatedCopy() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
