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

Side by Side Diff: Source/core/xml/XMLTreeViewer.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 unified diff | Download patch
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | public/blink_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
(...skipping 14 matching lines...) Expand all
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/xml/XMLTreeViewer.h" 30 #include "core/xml/XMLTreeViewer.h"
31 31
32 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 32 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
33 #include "bindings/core/v8/ScriptController.h" 33 #include "bindings/core/v8/ScriptController.h"
34 #include "bindings/core/v8/ScriptSourceCode.h" 34 #include "bindings/core/v8/ScriptSourceCode.h"
35 #include "core/XMLViewerCSS.h"
36 #include "core/XMLViewerJS.h"
37 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
38 #include "core/dom/Element.h" 36 #include "core/dom/Element.h"
39 #include "core/dom/Text.h" 37 #include "core/dom/Text.h"
40 #include "core/frame/LocalFrame.h" 38 #include "core/frame/LocalFrame.h"
39 #include "public/platform/Platform.h"
41 40
42 namespace blink { 41 namespace blink {
43 42
44 XMLTreeViewer::XMLTreeViewer(Document* document) 43 XMLTreeViewer::XMLTreeViewer(Document* document)
45 : m_document(document) 44 : m_document(document)
46 { 45 {
47 } 46 }
48 47
49 void XMLTreeViewer::transformDocumentToTreeView() 48 void XMLTreeViewer::transformDocumentToTreeView()
50 { 49 {
50 const blink::WebData& xmlViewerJSResource = blink::Platform::current()->load Resource("XMLViewer.js");
51 const blink::WebData& xmlViewerCSSResource = blink::Platform::current()->loa dResource("XMLViewer.css");
52 if (xmlViewerJSResource.isEmpty() || xmlViewerCSSResource.isEmpty())
53 return;
54
51 m_document->setIsViewSource(true); 55 m_document->setIsViewSource(true);
52 String scriptString(reinterpret_cast<const char*>(XMLViewer_js), sizeof(XMLV iewer_js)); 56 String scriptString(xmlViewerJSResource.data(), xmlViewerJSResource.size());
53 m_document->frame()->script().executeScriptInMainWorld(scriptString, ScriptC ontroller::ExecuteScriptWhenScriptsDisabled); 57 m_document->frame()->script().executeScriptInMainWorld(scriptString, ScriptC ontroller::ExecuteScriptWhenScriptsDisabled);
54 String noStyleMessage("This XML file does not appear to have any style infor mation associated with it. The document tree is shown below."); 58 String noStyleMessage("This XML file does not appear to have any style infor mation associated with it. The document tree is shown below.");
55 m_document->frame()->script().executeScriptInMainWorld("prepareWebKitXMLView er('" + noStyleMessage + "');", ScriptController::ExecuteScriptWhenScriptsDisabl ed); 59 m_document->frame()->script().executeScriptInMainWorld("prepareWebKitXMLView er('" + noStyleMessage + "');", ScriptController::ExecuteScriptWhenScriptsDisabl ed);
56 60
57 String cssString(reinterpret_cast<const char*>(XMLViewer_css), sizeof(XMLVie wer_css)); 61 String cssString(xmlViewerCSSResource.data(), xmlViewerCSSResource.size());
58 m_document->getElementById("xml-viewer-style")->appendChild(m_document->crea teTextNode(cssString), IGNORE_EXCEPTION); 62 m_document->getElementById("xml-viewer-style")->appendChild(m_document->crea teTextNode(cssString), IGNORE_EXCEPTION);
59 } 63 }
60 64
61 } // namespace blink 65 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | public/blink_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698