summaryrefslogtreecommitdiffstats
path: root/tools/grit/grit/node/include.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/grit/grit/node/include.py')
-rw-r--r--tools/grit/grit/node/include.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/grit/grit/node/include.py b/tools/grit/grit/node/include.py
index cb64866..7cfa45e 100644
--- a/tools/grit/grit/node/include.py
+++ b/tools/grit/grit/node/include.py
@@ -1,5 +1,5 @@
#!/usr/bin/python2.4
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -30,11 +30,12 @@ class IncludeNode(base.Node):
def _IsValidChild(self, child):
return False
- def _GetFlattenedData(self):
+ def _GetFlattenedData(self, allow_external_script=False):
if not self._flattened_data:
filename = self.FilenameToOpen()
self._flattened_data = (
- grit.format.html_inline.InlineToString(filename, self))
+ grit.format.html_inline.InlineToString(filename, self,
+ allow_external_script=allow_external_script))
return self._flattened_data
def MandatoryAttributes(self):
@@ -45,6 +46,7 @@ class IncludeNode(base.Node):
'generateid': 'true',
'filenameonly': 'false',
'flattenhtml': 'false',
+ 'allowexternalscript': 'false',
'relativepath': 'false',
}
@@ -80,7 +82,8 @@ class IncludeNode(base.Node):
id_map = rc_header.Item.tids_
id = id_map[self.GetTextualIds()[0]]
if self.attrs['flattenhtml'] == 'true':
- data = self._GetFlattenedData()
+ allow_external_script = self.attrs['allowexternalscript'] == 'true'
+ data = self._GetFlattenedData(allow_external_script=allow_external_script)
else:
filename = self.FilenameToOpen()
infile = open(filename, 'rb')