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

Unified Diff: Source/core/inspector/InjectedScriptManager.cpp

Issue 391963002: [Blink] XMLTreeViewer should load resources from blink_resources.grd instead of relying upon xxd.py (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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
« no previous file with comments | « Source/core/inspector/InjectedScriptCanvasModule.cpp ('k') | Source/core/inspector/InspectorOverlay.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InjectedScriptManager.cpp
diff --git a/Source/core/inspector/InjectedScriptManager.cpp b/Source/core/inspector/InjectedScriptManager.cpp
index a2e7ecc483e956c9dfacd285698f62305b1df0c0..5d1e19bb12020bb1da9c362fcd72226e3d0c5339 100644
--- a/Source/core/inspector/InjectedScriptManager.cpp
+++ b/Source/core/inspector/InjectedScriptManager.cpp
@@ -32,11 +32,12 @@
#include "core/inspector/InjectedScriptManager.h"
#include "bindings/core/v8/ScriptValue.h"
-#include "core/InjectedScriptSource.h"
#include "core/inspector/InjectedScript.h"
#include "core/inspector/InjectedScriptHost.h"
#include "core/inspector/JSONParser.h"
#include "platform/JSONValues.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebData.h"
#include "wtf/PassOwnPtr.h"
namespace blink {
@@ -157,7 +158,8 @@ void InjectedScriptManager::releaseObjectGroup(const String& objectGroup)
String InjectedScriptManager::injectedScriptSource()
{
- return String(reinterpret_cast<const char*>(InjectedScriptSource_js), sizeof(InjectedScriptSource_js));
+ const blink::WebData& injectedScriptSourceResource = blink::Platform::current()->loadResource("InjectedScriptSource.js");
+ return String(injectedScriptSourceResource.data(), injectedScriptSourceResource.size());
}
InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState* inspectedScriptState)
« no previous file with comments | « Source/core/inspector/InjectedScriptCanvasModule.cpp ('k') | Source/core/inspector/InspectorOverlay.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698