Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: Source/core/frame/DOMWindowPrivateScript.cpp

Issue 516273002: Move plugin placeholder style to CSS, and allow it to bypass main world CSP. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase and rewrite Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/frame/DOMWindowPrivateScript.cpp
diff --git a/Source/platform/exported/WebSerializedOrigin.cpp b/Source/core/frame/DOMWindowPrivateScript.cpp
similarity index 51%
copy from Source/platform/exported/WebSerializedOrigin.cpp
copy to Source/core/frame/DOMWindowPrivateScript.cpp
index bc90296d55c3bf3b41553fc81434fd28adf6b4a9..f27f89dd9338f2af30f6a3a2b7fea7d1c1cae219 100644
--- a/Source/platform/exported/WebSerializedOrigin.cpp
+++ b/Source/core/frame/DOMWindowPrivateScript.cpp
@@ -3,15 +3,15 @@
// found in the LICENSE file.
#include "config.h"
-#include "public/platform/WebSerializedOrigin.h"
+#include "core/frame/DOMWindowPrivateScript.h"
-#include "platform/weborigin/SecurityOrigin.h"
+#include "platform/PlatformResourceLoader.h"
namespace blink {
-WebSerializedOrigin::WebSerializedOrigin(const SecurityOrigin& origin)
- : m_string(origin.toString())
+String DOMWindowPrivateScript::loadPlatformResource(const String& name)
{
+ return loadResourceAsASCIIString(name.ascii().data());
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698