Landing http://codereview.chromium.org/115998 for benm@google.com

R=benm@google.com
TEST=no layout test regressions.
BUG=none


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17633 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 28 deletions

diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index 764c19f..815e385 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -257,15 +257,12 @@ sub GenerateHeader
     # - Add default header template
     @headerContent = split("\r", $headerTemplate);
 
-    # - Add header protection
-    if ($className =~ /^V8SVG/) {
-        push(@headerContent, "\n#if ENABLE(SVG)\n");
-    } elsif (IsVideoClassName($className)) {
-        push(@headerContent, "\n#if ENABLE(VIDEO)\n");
-    } elsif (IsWorkerClassName($className)) {
-        push(@headerContent, "\n#if ENABLE(WORKERS)\n");
+    my $conditionalString;
+    if ($conditional) {
+        $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
+        push(@headerContent, "\n#if ${conditionalString}\n\n");
     }
-    
+
     push(@headerContent, "\n#ifndef $className" . "_H");
     push(@headerContent, "\n#define $className" . "_H\n\n");
 
@@ -308,13 +305,7 @@ END
     push(@headerContent, "}\n\n");
     push(@headerContent, "#endif // $className" . "_H\n");
 
-    if ($className =~ /^V8SVG/) {
-        push(@headerContent, "\n#endif // ENABLE(SVG)\n");
-    } elsif (IsVideoClassName($className)) {
-        push(@headerContent, "\n#endif // ENABLE(VIDEO)\n");
-    } elsif (IsWorkerClassName($className)) {
-        push(@headerContent, "\n#endif // ENABLE(WORKERS)\n");
-    }
+    push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditional;
 }
 
 
@@ -1063,12 +1054,10 @@ sub GenerateImplementation
          "#include \"v8_binding.h\"\n\n" .
          "#undef LOG\n\n");
  
-    if ($className =~ /^V8SVG/) {
-        push(@implFixedHeader, "#if ENABLE(SVG)\n\n");
-    } elsif (IsVideoClassName($className)) {
-        push(@implFixedHeader, "#if ENABLE(VIDEO)\n\n");
-    } elsif (IsWorkerClassName($className)) {
-        push(@implFixedHeader, "#if ENABLE(WORKERS)\n\n");
+    my $conditionalString;
+    if ($conditional) {
+        $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
+        push(@implFixedHeader, "\n#if ${conditionalString}\n\n");
     }
     
     if ($className =~ /^V8SVGAnimated/) {
@@ -1393,13 +1382,7 @@ END
 } // namespace WebCore 
 END
 
-    if ($className =~ /^V8SVG/) {
-        push(@implContent, "\n#endif // ENABLE(SVG)\n");
-    } elsif (IsVideoClassName($className)) {
-        push(@implContent, "\n#endif // ENABLE(VIDEO)\n");
-    } elsif (IsWorkerClassName($className)) {
-        push(@implContent, "\n#endif // ENABLE(WORKERS)\n");
-    }
+    push(@implContent, "\n#endif // ${conditionalString}\n") if $conditional;
 }
 
 
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index f567e5d..c347ceb 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -338,12 +338,16 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
   VIDEO_NONNODE_TYPES(V)                                                \
   WORKER_NONNODE_WRAPPER_TYPES(V)
 
+#if ENABLE(DATABASE)
 #define DOM_OBJECT_DATABASE_TYPES(V)                                    \
   V(DATABASE, Database)                                                 \
   V(SQLERROR, SQLError)                                                 \
   V(SQLRESULTSET, SQLResultSet)                                         \
   V(SQLRESULTSETROWLIST, SQLResultSetRowList)                           \
   V(SQLTRANSACTION, SQLTransaction)
+#else
+#define DOM_OBJECT_DATABASE_TYPES(V)
+#endif
 
 #define DOM_OBJECT_TYPES(V)                                             \
   DOM_OBJECT_TYPES_1(V)                                                 \