Diff
Modified: trunk/Source/WebCore/ChangeLog (147166 => 147167)
--- trunk/Source/WebCore/ChangeLog 2013-03-28 22:01:32 UTC (rev 147166)
+++ trunk/Source/WebCore/ChangeLog 2013-03-28 22:07:12 UTC (rev 147167)
@@ -1,3 +1,22 @@
+2013-03-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r147130.
+ http://trac.webkit.org/changeset/147130
+ https://bugs.webkit.org/show_bug.cgi?id=113539
+
+ Not needed now that we do not sleep in preprocessor.pm
+ (Requested by jamesr on #webkit).
+
+ * WebCore.gyp/WebCore.gyp:
+ * bindings/scripts/CodeGenerator.pm:
+ (ParseInterface):
+ * bindings/scripts/IDLParser.pm:
+ (Parse):
+ * bindings/scripts/generate-bindings.pl:
+ * bindings/scripts/generate-preprocessed-idls.pl: Removed.
+ * bindings/scripts/preprocessor.pm:
+ (applyPreprocessor):
+
2013-03-28 Nate Chapin <[email protected]>
Don't grant local content permissions for appcache loads.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (147166 => 147167)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2013-03-28 22:01:32 UTC (rev 147166)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2013-03-28 22:07:12 UTC (rev 147167)
@@ -595,60 +595,12 @@
]
},
{
- 'target_name': 'generate_preprocessed_idls',
- 'type': 'none',
- 'sources': [
- '<@(bindings_idl_files)',
- '<@(webcore_test_support_idl_files)',
- ],
- 'rules': [
- # Rules to build derived sources.
- {
- 'rule_name': 'binding',
- 'extension': 'idl',
- 'msvs_external_rule': 1,
- 'variables': {
- # SVGURIReference.idl is manually added because the generated
- # bindings code causes compile errors when it's compiled at the
- # top level, but we want to avoid redundant preprocessing of it in
- # the bindings generation stage when it's referenced by other
- # files.
- 'all_idl_files_list': '<|(all_idl_files_list.tmp <@(bindings_idl_files) <@(webcore_test_support_idl_files) ../svg/SVGURIReference.idl)',
- },
- 'inputs': [
- '../bindings/scripts/generate-preprocessed-idls.pl',
- '../bindings/scripts/preprocessor.pm',
- '<(all_idl_files_list)',
- '<!@(cat <(all_idl_files_list))',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/<(RULE_INPUT_ROOT).idl.pp',
- ],
- 'msvs_cygwin_shell': 0,
- 'action': [
- '<(perl_exe)',
- '-w',
- '-I../bindings/scripts',
- '../bindings/scripts/generate-preprocessed-idls.pl',
- '--output',
- '<@(_outputs)',
- '--defines',
- '<(feature_defines) LANGUAGE_JAVASCRIPT V8_BINDING',
- '<(RULE_INPUT_PATH)',
- '<@(preprocessor)',
- ],
- 'message': 'Preprocessing <(RULE_INPUT_PATH)',
- },
- ],
- },
- {
'target_name': 'webcore_bindings_sources',
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'generate_supplemental_dependency',
'generate_settings',
- 'generate_preprocessed_idls',
],
'sources': [
# bison rule
Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (147166 => 147167)
--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2013-03-28 22:01:32 UTC (rev 147166)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2013-03-28 22:07:12 UTC (rev 147167)
@@ -304,7 +304,7 @@
# Step #2: Parse the found IDL file (in quiet mode).
my $parser = IDLParser->new(1);
- my $document = $parser->Parse($filename, $defines, $preprocessor, $useOutputDir);
+ my $document = $parser->Parse($filename, $defines, $preprocessor);
foreach my $interface (@{$document->interfaces}) {
if ($interface->name eq $interfaceName) {
Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (147166 => 147167)
--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2013-03-28 22:01:32 UTC (rev 147166)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2013-03-28 22:07:12 UTC (rev 147167)
@@ -176,11 +176,10 @@
my $fileName = shift;
my $defines = shift;
my $preprocessor = shift;
- my $outputDirectory = shift;
my @definitions = ();
- my @lines = applyPreprocessor($fileName, $defines, $preprocessor, $outputDirectory);
+ my @lines = applyPreprocessor($fileName, $defines, $preprocessor);
$self->{Line} = $lines[0];
$self->{DocumentContent} = join(' ', @lines);
Modified: trunk/Source/WebCore/bindings/scripts/generate-bindings.pl (147166 => 147167)
--- trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2013-03-28 22:01:32 UTC (rev 147166)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2013-03-28 22:07:12 UTC (rev 147167)
@@ -124,7 +124,7 @@
# Parse the target IDL file.
my $targetParser = IDLParser->new(!$verbose);
-my $targetDocument = $targetParser->Parse($targetIdlFile, $defines, $preprocessor, $outputDirectory);
+my $targetDocument = $targetParser->Parse($targetIdlFile, $defines, $preprocessor);
if ($idlAttributesFile) {
my $idlAttributes = loadIDLAttributes($idlAttributesFile);
@@ -136,7 +136,7 @@
my $interfaceName = fileparse(basename($idlFile), ".idl");
my $parser = IDLParser->new(!$verbose);
- my $document = $parser->Parse($idlFile, $defines, $preprocessor, $outputDirectory);
+ my $document = $parser->Parse($idlFile, $defines, $preprocessor);
foreach my $interface (@{$document->interfaces}) {
if ($interface->extendedAttributes->{"Supplemental"} and $interface->extendedAttributes->{"Supplemental"} eq $targetInterfaceName) {
Deleted: trunk/Source/WebCore/bindings/scripts/generate-preprocessed-idls.pl (147166 => 147167)
--- trunk/Source/WebCore/bindings/scripts/generate-preprocessed-idls.pl 2013-03-28 22:01:32 UTC (rev 147166)
+++ trunk/Source/WebCore/bindings/scripts/generate-preprocessed-idls.pl 2013-03-28 22:07:12 UTC (rev 147167)
@@ -1,41 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Copyright (C) 2013 Google Inc. All rights reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this library; see the file COPYING.LIB. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-
-use strict;
-
-use preprocessor;
-use Getopt::Long;
-use Cwd;
-
-my $defines;
-my $preprocessor;
-my $output;
-
-GetOptions('defines=s' => \$defines,
- 'preprocessor=s' => \$preprocessor,
- 'output=s' => \$output);
-
-die('Must specify #define macros using --defines.') unless defined($defines);
-die('Must specify the output using --output.') unless defined($output);
-
-my @contents = applyPreprocessor($ARGV[0], $defines, $preprocessor, undef);
-open (FILE, ">$output") || die "Couldn't open $output\n";
-print FILE @contents;
-close FILE;
Modified: trunk/Source/WebCore/bindings/scripts/preprocessor.pm (147166 => 147167)
--- trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2013-03-28 22:01:32 UTC (rev 147166)
+++ trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2013-03-28 22:07:12 UTC (rev 147167)
@@ -22,7 +22,6 @@
use warnings;
use Config;
-use File::Basename;
use IPC::Open2;
use IPC::Open3;
@@ -42,20 +41,7 @@
my $fileName = shift;
my $defines = shift;
my $preprocessor = shift;
- my $outputDirectory = shift;
- if ($outputDirectory) {
- # If the preprocessed build file was generated already by the build
- # system, then return that one. This avoids N^2 behavior in reapplying
- # the preprocessor the idl files referenced by other idl files.
- my $baseName = basename($fileName);
- my $preprocessedFile = "$outputDirectory/$baseName.pp";
- if (-e $preprocessedFile) {
- my @lines = do { local @ARGV = $preprocessedFile; <> };
- return @lines;
- }
- }
-
my @args = ();
if (!$preprocessor) {
require Config;
