From 20020af46663b6243b52db79aaf586cf6c1e525b Mon Sep 17 00:00:00 2001
From: "haraken@chromium.org"
 <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 8 Feb 2012 23:14:46 +0000
Subject: [PATCH] Remove [CustomHeader] from CanvasPixelArray and rename
 [CustomHeader] to [JSCustomHeader]
 https://bugs.webkit.org/show_bug.cgi?id=78089

Reviewed by Adam Barth.

This patch removes [CustomHeader] from CanvasPixelArray.idl, since CanvasPixelArrayCustom.h
does not exist. (The reason why missing CanvasPixelArrayCustom.h has not caused build failure
is that [CustomHeader] has been JSC-specific and JSC has not enabled CanvasPixelArray.)
Also, this patch renames [CustomHeader] to [JSCustomHeader], since whether a given class
should have custom header or not will depend on JavaScript bindings.

No tests. No change in behavior.

* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
* dom/Node.idl:
* html/canvas/CanvasPixelArray.idl:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107137 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Source/WebCore/ChangeLog                           | 20 ++++++++++++++++++++
 Source/WebCore/bindings/scripts/CodeGeneratorJS.pm |  4 ++--
 Source/WebCore/dom/Node.idl                        |  2 +-
 Source/WebCore/html/canvas/CanvasPixelArray.idl    |  1 -
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8f8ca81..24b10e3 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2012-02-08  Kentaro Hara  <haraken@chromium.org>
+
+        Remove [CustomHeader] from CanvasPixelArray and rename [CustomHeader] to [JSCustomHeader]
+        https://bugs.webkit.org/show_bug.cgi?id=78089
+
+        Reviewed by Adam Barth.
+
+        This patch removes [CustomHeader] from CanvasPixelArray.idl, since CanvasPixelArrayCustom.h
+        does not exist. (The reason why missing CanvasPixelArrayCustom.h has not caused build failure
+        is that [CustomHeader] has been JSC-specific and JSC has not enabled CanvasPixelArray.)
+        Also, this patch renames [CustomHeader] to [JSCustomHeader], since whether a given class
+        should have custom header or not will depend on JavaScript bindings.
+
+        No tests. No change in behavior.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader):
+        * dom/Node.idl:
+        * html/canvas/CanvasPixelArray.idl:
+
 2012-02-08  Zalan Bujtas  <zbujtas@gmail.com>
 
         Dispatch updateViewportArguments(), when Document is finished
diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 5052f13..5499246 100644
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -749,9 +749,9 @@ sub GenerateHeader
     # Prototype
     push(@headerContent, "    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);\n") unless ($dataNode->extendedAttributes->{"ExtendsDOMGlobalObject"});
 
-    $headerTrailingIncludes{"${className}Custom.h"} = 1 if $dataNode->extendedAttributes->{"CustomHeader"};
+    $headerTrailingIncludes{"${className}Custom.h"} = 1 if $dataNode->extendedAttributes->{"JSCustomHeader"};
 
-    $implIncludes{"${className}Custom.h"} = 1 if !$dataNode->extendedAttributes->{"CustomHeader"} && ($dataNode->extendedAttributes->{"CustomPutFunction"} || $dataNode->extendedAttributes->{"CustomNamedSetter"});
+    $implIncludes{"${className}Custom.h"} = 1 if !$dataNode->extendedAttributes->{"JSCustomHeader"} && ($dataNode->extendedAttributes->{"CustomPutFunction"} || $dataNode->extendedAttributes->{"CustomNamedSetter"});
 
     my $hasGetter = $numAttributes > 0
                  || !$dataNode->extendedAttributes->{"OmitConstructor"}
diff --git a/Source/WebCore/dom/Node.idl b/Source/WebCore/dom/Node.idl
index 621b4eb..b67be68 100644
--- a/Source/WebCore/dom/Node.idl
+++ b/Source/WebCore/dom/Node.idl
@@ -21,7 +21,7 @@
 module core {
 
     interface [
-        CustomHeader,
+        JSCustomHeader,
         JSCustomMarkFunction,
         JSCustomPushEventHandlerScope,
         JSCustomIsReachable,
diff --git a/Source/WebCore/html/canvas/CanvasPixelArray.idl b/Source/WebCore/html/canvas/CanvasPixelArray.idl
index 319bd2d..b6e4a2e 100644
--- a/Source/WebCore/html/canvas/CanvasPixelArray.idl
+++ b/Source/WebCore/html/canvas/CanvasPixelArray.idl
@@ -30,7 +30,6 @@ module html {
 #if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT || defined(V8_BINDING) && V8_BINDING
     interface [
         OmitConstructor,
-        CustomHeader,
         HasNumericIndexGetter,
         CustomIndexedSetter
     ] CanvasPixelArray {
-- 
2.7.4