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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "public/platform/WebSerializedOrigin.h" 6 #include "core/frame/DOMWindowPrivateScript.h"
7 7
8 #include "platform/weborigin/SecurityOrigin.h" 8 #include "platform/PlatformResourceLoader.h"
9 9
10 namespace blink { 10 namespace blink {
11 11
12 WebSerializedOrigin::WebSerializedOrigin(const SecurityOrigin& origin) 12 String DOMWindowPrivateScript::loadPlatformResource(const String& name)
13 : m_string(origin.toString())
14 { 13 {
14 return loadResourceAsASCIIString(name.ascii().data());
15 } 15 }
16 16
17 } // namespace blink 17 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698