Title: [115212] trunk/Source/WebCore
- Revision
- 115212
- Author
- commit-qu...@webkit.org
- Date
- 2012-04-25 08:29:36 -0700 (Wed, 25 Apr 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=84875
make-css-file-arrays.pl now only take css files, make it also take js files,
as for html popups we also need load js files.
Reviewed by Antonio Gomes.
* css/make-css-file-arrays.pl:
Patch by Crystal Zhang <haizh...@rim.com> on 2012-04-25
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115211 => 115212)
--- trunk/Source/WebCore/ChangeLog 2012-04-25 15:24:31 UTC (rev 115211)
+++ trunk/Source/WebCore/ChangeLog 2012-04-25 15:29:36 UTC (rev 115212)
@@ -1,3 +1,13 @@
+2012-04-25 Crystal Zhang <haizh...@rim.com>
+ https://bugs.webkit.org/show_bug.cgi?id=84875
+
+ make-css-file-arrays.pl now only take css files, make it also take js files,
+ as for html popups we also need load js files.
+
+ Reviewed by Antonio Gomes.
+
+ * css/make-css-file-arrays.pl:
+
2012-04-25 Li Yin <li....@intel.com>
[chromium][workers] setTargetType(ResourceRequest::TargetIsWorker) is repeatedly called in chromium
Modified: trunk/Source/WebCore/css/make-css-file-arrays.pl (115211 => 115212)
--- trunk/Source/WebCore/css/make-css-file-arrays.pl 2012-04-25 15:24:31 UTC (rev 115211)
+++ trunk/Source/WebCore/css/make-css-file-arrays.pl 2012-04-25 15:29:36 UTC (rev 115212)
@@ -41,7 +41,7 @@
print OUT "namespace WebCore {\n";
for my $in (@ARGV) {
- $in =~ /(\w+)\.css$/ or die;
+ $in =~ /(\w+)\.css$/ or $in =~ /(\w+)\.js$/ or die;
my $name = $1;
# Slurp in the CSS file.
@@ -72,8 +72,13 @@
# Write out a C array of the characters.
my $length = length $text;
- print HEADER "extern const char ${name}UserAgentStyleSheet[${length}];\n";
- print OUT "extern const char ${name}UserAgentStyleSheet[${length}] = {\n";
+ if ($in =~ /(\w+)\.css$/) {
+ print HEADER "extern const char ${name}UserAgentStyleSheet[${length}];\n";
+ print OUT "extern const char ${name}UserAgentStyleSheet[${length}] = {\n";
+ } else {
+ print HEADER "extern const char ${name}_javascript_[${length}];\n";
+ print OUT "extern const char ${name}_javascript_[${length}] = {\n";
+ }
my $i = 0;
while ($i < $length) {
print OUT " ";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
