Unreviewed, rolling out r101783.
authorvsevik@chromium.org <vsevik@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 14:15:40 +0000 (14:15 +0000)
committervsevik@chromium.org <vsevik@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 14:15:40 +0000 (14:15 +0000)
http://trac.webkit.org/changeset/101783
https://bugs.webkit.org/show_bug.cgi?id=73652

Broke chromium win build. (Requested by vsevik on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-12-02

* WebCore.gyp/WebCore.gyp:
* WebCore.gyp/scripts/action_derivedsourcesallinone.py:
(main):
* WebCore.gypi:
* bindings/scripts/generate-bindings.pl:
* page/DOMWindow.idl:
* webaudio/DOMWindowWebAudio.idl: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101789 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gyp/scripts/action_derivedsourcesallinone.py
Source/WebCore/WebCore.gypi
Source/WebCore/bindings/scripts/generate-bindings.pl
Source/WebCore/page/DOMWindow.idl
Source/WebCore/webaudio/DOMWindowWebAudio.idl [deleted file]

index 51a6b4a..ce1a7ec 100644 (file)
@@ -1,3 +1,19 @@
+2011-12-02  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101783.
+        http://trac.webkit.org/changeset/101783
+        https://bugs.webkit.org/show_bug.cgi?id=73652
+
+        Broke chromium win build. (Requested by vsevik on #webkit).
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gyp/scripts/action_derivedsourcesallinone.py:
+        (main):
+        * WebCore.gypi:
+        * bindings/scripts/generate-bindings.pl:
+        * page/DOMWindow.idl:
+        * webaudio/DOMWindowWebAudio.idl: Removed.
+
 2011-11-28  Alexander Pavlov  <apavlov@chromium.org>
 
         Inline non-replaced elements are reported to have zero width and height
index e3b1cd7..22a48c0 100644 (file)
       ]
     },
     {
-      'target_name': 'generate_supplemental_dependency',
-      'type': 'none',
-      'actions': [
-         {
-          'action_name': 'generateSupplementalDependency',
-          'variables': {
-            # Write sources into a file, so that the action command line won't
-            # exceed OS limits.
-            'idl_files_list': '<|(idl_files_list.tmp <@(bindings_idl_files))',
-          },
-          'inputs': [
-            '../bindings/scripts/resolve-supplemental.pl',
-            '../bindings/scripts/IDLParser.pm',
-            '<(idl_files_list)',
-            '<!@(cat <(idl_files_list))',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
-          ],
-          'action': [
-            'perl',
-            '-w',
-            '-I../bindings/scripts',
-            '../bindings/scripts/resolve-supplemental.pl',
-            '--defines',
-            '<(feature_defines) LANGUAGE_JAVASCRIPT V8_BINDING',
-            '--idlFilesList',
-            '<(idl_files_list)',
-            '--supplementalDependencyFile',
-            '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
-          ],
-          'message': 'Resolving [Supplemental=XXX] dependencies in all IDL files',
-        }
-      ]
-    },
-    {
       'target_name': 'webcore_bindings_sources',
       'type': 'none',
       'hard_dependency': 1,
-      'dependencies': [
-        'generate_supplemental_dependency',
-      ],
       'sources': [
         # bison rule
         '../css/CSSGrammar.y',
         },
         {
           'action_name': 'derived_sources_all_in_one',
+          'variables': {
+            # Write sources into a file, so that the action command line won't
+            # exceed OS limites.
+            'idls_list_temp_file': '<|(idls_list_temp_file.tmp <@(bindings_idl_files))',
+          },
           'inputs': [
             'scripts/action_derivedsourcesallinone.py',
-            '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
+            '<(idls_list_temp_file)',
+            '<!@(cat <(idls_list_temp_file))',
           ],
           'outputs': [
             '<@(derived_sources_aggregate_files)',
           'action': [
             'python',
             'scripts/action_derivedsourcesallinone.py',
-            '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
+            '<(idls_list_temp_file)',
             '--',
             '<@(derived_sources_aggregate_files)',
           ],
             '../bindings/scripts/IDLParser.pm',
             '../bindings/scripts/IDLStructure.pm',
             '../bindings/scripts/preprocessor.pm',
-            '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
           ],
           'outputs': [
             # FIXME:  The .cpp file should be in webkit/bindings once
             '--generator',
             'V8',
             '<@(generator_include_dirs)',
-            '--supplementalDependencyFile',
-            '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
             '<(RULE_INPUT_PATH)',
           ],
           'message': 'Generating binding from <(RULE_INPUT_PATH)',
index 42c45e7..586071b 100644 (file)
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# action_derivedsourcesallinone.py generates a single cpp file that includes
+# action_derivedsourceslist.py generates a single cpp file that includes
 # all v8 bindings cpp files generated from idls. Files can be assigned into
 # multiple output files, to reduce maximum compilation unit size and allow
 # parallel compilation.
 #
-# usage: action_derivedsourcesallinone.py IDL_FILES_LIST -- OUTPUT_FILE1 OUTPUT_FILE2 ...
+# usage: action_derivedsourceslist.py IDL_FILES_LIST -- OUTPUT_FILE1 OUTPUT_FILE2 ...
 #
 # Note that IDL_FILES_LIST is a text file containing the IDL file paths.
 
@@ -186,9 +186,7 @@ def main(args):
     outputFileNames = args[inOutBreakIndex+1:]
 
     inputFile = open(inputFileName, 'r')
-    idlFileNames = []
-    for line in inputFile:
-        idlFileNames.append(line[:-1].split(' ')[0])
+    idlFileNames = inputFile.read().split('\n')
     inputFile.close()
 
     filesMetaData = extractMetaData(idlFileNames)
index 1edd7d9..414d2e2 100644 (file)
             'webaudio/BiquadFilterNode.idl',
             'webaudio/ConvolverNode.idl',
             'webaudio/DelayNode.idl',
-            'webaudio/DOMWindowWebAudio.idl',
             'webaudio/DynamicsCompressorNode.idl',
             'webaudio/HighPass2FilterNode.idl',
             'webaudio/JavaScriptAudioNode.idl',
index babb5f1..1630345 100755 (executable)
@@ -112,79 +112,6 @@ if ($supplementalDependencyFile) {
 my $targetParser = IDLParser->new(!$verbose);
 my $targetDocument = $targetParser->Parse($targetIdlFile, $defines, $preprocessor);
 
-# FIXME(haraken): Remove this if-else statement.
-# This if-else statement is temporary and will be removed
-# after build scripts for all platforms support [Supplemental] IDL.
-# The motivation for the [Supplemented] IDL is as follows:
-#
-# In order to support the [Supplemental] IDL, we need to
-# (1) run resolve-supplemental.pl and generate supplemental_dependency.tmp
-# (2) and run generate-bindings.pl with the supplemental_dependency.tmp.
-#
-# This build flow requires a change on the following build scripts,
-# but changing all the build scripts all at once without any regression is too difficult:
-#
-#     - DerivedSources.make
-#     - DerivedSources.pri
-#     - GNUmakefile.am
-#     - PlatformBlackBerry.cmake
-#     - UseJSC.cmake
-#     - UseV8.cmake
-#     - WebCore.vcproj/MigrateScripts
-#     - WebCore.vcproj/WebCore.vcproj
-#     - bindings/gobject/GNUmakefile.am
-#     - WebCore.gyp/WebCore.gyp
-#
-# Thus, we are planning to change the build scripts one by one, which implies that
-# we need to allow the temporary state in which some build scripts support [Supplemental] IDL
-# but others do not. To accomplish this, we introduce a temporal IDL, [Supplemented].
-# The [Supplemented] IDL on an attribute means that the attribute is marked with [Supplemental]
-# in another IDL file somewhere, like this:
-#
-# DOMWindowWebAudio.idl:
-#     interface [
-#         Supplemental=DOMWindow
-#     ] DOMWindowWebAudio {
-#         attribute attr1;
-#         attribute attr2;
-#     };
-#
-# DOMWindow.idl:
-#     interface [
-#     ] DOMWindow {
-#         attribute [Supplemented] attr1; // This line will be removed after all build scripts support the [SupplementalL.
-#         attribute [Supplemented] attr2; // This line will be removed after all build scripts support the [SupplementalL.
-#         attribute attr3;
-#         attribute attr4;
-#     };
-#
-# Assuming these IDL files, the below code is doing the following logic:
-#
-#     - If a given build script supports the [Supplemental] IDL (i.e. --supplementalDependencyFile is specified),
-#       we ignore all attributes with the [Supplemented] IDL.
-#     - Otherwise (i.e. --supplementalDependencyFile is not specified),
-#       we treat all attributes with the [Supplemented] IDL as normal attributes
-#       and instead ignore all attributes with the [Supplemental] IDL
-#       (i.e. we generate nothing from the idl file with the [Supplemental] IDL).
-if ($supplementalDependencyFile) {
-    foreach my $dataNode (@{$targetDocument->classes}) {
-        my @nonSupplementedAttributes;
-        foreach my $attribute (@{$dataNode->attributes}) {
-            if (!$attribute->signature->extendedAttributes->{"Supplemented"}) {
-                push(@nonSupplementedAttributes, $attribute);
-            }
-        }
-        $dataNode->attributes(\@nonSupplementedAttributes);
-    }
-} else {
-    foreach my $dataNode (@{$targetDocument->classes}) {
-        if ($dataNode->extendedAttributes->{"Supplemental"}) {
-            exit 0;
-        }
-    }
-}
-# Temporary if-else statement until here.
-
 foreach my $idlFile (@supplementedIdlFiles) {
     next if $idlFile eq $targetIdlFile;
 
index 9028b1a..a264f95 100644 (file)
@@ -522,8 +522,8 @@ module window {
         attribute [JSCCustomGetter] Float64ArrayConstructor Float64Array; // Usable with new operator
         attribute [JSCCustomGetter] DataViewConstructor DataView; // Usable with new operator
 
-        attribute [Supplemented, JSCCustomGetter, Conditional=WEB_AUDIO, EnabledAtRuntime] AudioContextConstructor webkitAudioContext; // Usable with new operator
-        attribute [Supplemented, Conditional=WEB_AUDIO] AudioPannerNodeConstructor webkitAudioPannerNode; // Needed for panning model constants
+        attribute [JSCCustomGetter,Conditional=WEB_AUDIO,EnabledAtRuntime] AudioContextConstructor webkitAudioContext; // Usable with new operator
+        attribute [Conditional=WEB_AUDIO] AudioPannerNodeConstructor webkitAudioPannerNode; // Needed for panning model constants
 
         // Event Constructors
         attribute EventConstructor Event;
@@ -552,8 +552,8 @@ module window {
         attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent;
         attribute [Conditional=WEB_SOCKETS] CloseEventConstructor CloseEvent;
         attribute StorageEventConstructor StorageEvent;
-        attribute [Supplemented, Conditional=WEB_AUDIO] AudioProcessingEventConstructor AudioProcessingEvent;
-        attribute [Supplemented, Conditional=WEB_AUDIO] OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent;
+        attribute [Conditional=WEB_AUDIO] AudioProcessingEventConstructor AudioProcessingEvent;
+        attribute [Conditional=WEB_AUDIO] OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent;
         attribute [Conditional=INPUT_SPEECH] SpeechInputEventConstructor SpeechInputEvent;
         attribute [Conditional=MEDIA_STREAM] MediaStreamEventConstructor MediaStreamEvent;
         attribute [Conditional=WEBGL] WebGLContextEventConstructor WebGLContextEvent;
diff --git a/Source/WebCore/webaudio/DOMWindowWebAudio.idl b/Source/WebCore/webaudio/DOMWindowWebAudio.idl
deleted file mode 100644 (file)
index dd108ef..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-module window {
-
-    interface [
-        Conditional=WEB_AUDIO,
-        Supplemental=DOMWindow
-    ] DOMWindowWebAudio {
-        attribute [JSCCustomGetter, EnabledAtRuntime] AudioContextConstructor webkitAudioContext;
-        attribute AudioPannerNodeConstructor webkitAudioPannerNode;
-        attribute AudioProcessingEventConstructor AudioProcessingEvent;
-        attribute OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent;
-    };
-
-}
\ No newline at end of file