Revert both 3079 and 3063 because they caused linux and mac breakage.

Review URL: http://codereview.chromium.org/7015

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

1 files changed, 48 insertions, 64 deletions

diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 49eaf90..73d225a 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -52,19 +52,17 @@ env = env.Clone(
         'ENABLE_XSLT',
         'ENABLE_XPATH',
         'ENABLE_SVG',
-        'ENABLE_SVG_ANIMATION',
-        'ENABLE_SVG_AS_IMAGE',
-        'ENABLE_SVG_FONTS',
         'ENABLE_SVG_FOREIGN_OBJECT',
         'ENABLE_SVG_USE',
+        'ENABLE_SVG_AS_IMAGE',
+        'ENABLE_SVG_FONTS',
     ],
 
     SVG_FLAGS = [
-        'ENABLE_SVG_ANIMATION=1',
-        'ENABLE_SVG_AS_IMAGE=1',
-        'ENABLE_SVG_FONTS=1',
         'ENABLE_SVG_FOREIGN_OBJECT=1',
         'ENABLE_SVG_USE=1',
+        'ENABLE_SVG_AS_IMAGE=1',
+        'ENABLE_SVG_FONTS=1',
     ],
 
     BINDINGS_INCLUDE_PATH = [
@@ -166,21 +164,16 @@ idl_files = [
     'css/CSSUnknownRule.idl',
     'css/CSSValue.idl',
     'css/CSSValueList.idl',
-    'css/CSSVariablesDeclaration.idl',
-    'css/CSSVariablesRule.idl',
     'css/MediaList.idl',
     'css/Rect.idl',
     'css/RGBColor.idl',
     'css/StyleSheet.idl',
     'css/StyleSheetList.idl',
-    'css/WebKitCSSKeyframeRule.idl',
-    'css/WebKitCSSKeyframesRule.idl',
-    'css/WebKitCSSTransformValue.idl',
 
     'dom/Attr.idl',
     'dom/CDATASection.idl',
     'dom/CharacterData.idl',
-    'dom/Clipboard.idl',
+    'dom/Clipboard.idl',                          # port only
     'dom/Comment.idl',
     'dom/Document.idl',
     'dom/DocumentFragment.idl',
@@ -194,7 +187,7 @@ idl_files = [
     'dom/EventException.idl',
     'dom/EventListener.idl',
     'dom/EventTarget.idl',
-    'dom/EventTargetNode.idl',
+    'dom/EventTargetNode.idl',                    # port only
     'dom/KeyboardEvent.idl',
     'dom/MessageEvent.idl',
     'dom/MouseEvent.idl',
@@ -205,7 +198,6 @@ idl_files = [
     'dom/NodeIterator.idl',
     'dom/NodeList.idl',
     'dom/Notation.idl',
-    'dom/NSResolver.idl',
     'dom/OverflowEvent.idl',
     'dom/ProcessingInstruction.idl',
     'dom/ProgressEvent.idl',
@@ -215,16 +207,11 @@ idl_files = [
     'dom/TextEvent.idl',
     'dom/TreeWalker.idl',
     'dom/UIEvent.idl',
-    'dom/WebKitAnimationEvent.idl',
-    'dom/WebKitTransitionEvent.idl',
     'dom/WheelEvent.idl',
 
     'html/CanvasGradient.idl',
-    'html/CanvasPixelArray.idl',
     'html/CanvasPattern.idl',
     'html/CanvasRenderingContext2D.idl',
-    'html/File.idl',
-    'html/FileList.idl',
     'html/HTMLAnchorElement.idl',
     'html/HTMLAppletElement.idl',
     'html/HTMLAreaElement.idl',
@@ -277,7 +264,7 @@ idl_files = [
     'html/HTMLQuoteElement.idl',
     'html/HTMLScriptElement.idl',
     'html/HTMLSelectElement.idl',
-    'html/HTMLSelectionInputElement.idl',
+    'html/HTMLSelectionInputElement.idl',         # port only
     'html/HTMLSourceElement.idl',
     'html/HTMLStyleElement.idl',
     'html/HTMLTableCaptionElement.idl',
@@ -289,39 +276,54 @@ idl_files = [
     'html/HTMLTextAreaElement.idl',
     'html/HTMLTitleElement.idl',
     'html/HTMLUListElement.idl',
+    'html/UndetectableHTMLCollection.idl',        # port only
     'html/HTMLVideoElement.idl',
-    'html/ImageData.idl',
     'html/MediaError.idl',
-    'html/TextMetrics.idl',
     'html/TimeRanges.idl',
-    'html/UndetectableHTMLCollection.idl',
     'html/VoidCallback.idl',
 
-    # 'loader/appcache/DOMApplicationCache.idl',
-
     'page/AbstractView.idl',
     'page/BarInfo.idl',
     'page/Console.idl',
     'page/DOMSelection.idl',
     'page/DOMWindow.idl',
     'page/History.idl',
-    'page/JavaScriptCallFrame.idl',
-    'page/Location.idl',
-    'page/Navigator.idl',
     'page/Screen.idl',
 
-    'page/inspector/InspectorController.idl',
+    'page/inspector/InspectorController.idl',     # port only
+
+    'page/Navigator.idl',                          # port only
+    'page/Location.idl',                           # port only
+
+
+    'xml/DOMParser.idl',
+    'xml/DOMParser.idl',
+    'xml/XMLHttpRequest.idl',                     # port only
+    'xml/XMLHttpRequestException.idl',
+    'xml/XMLSerializer.idl',
+    'xml/XPathEvaluator.idl',
+    'xml/XPathException.idl',
+    'xml/XPathExpression.idl',
+    'xml/XPathNSResolver.idl',
+    'xml/XPathResult.idl',
+    'xml/XSLTProcessor.idl',                      # port only
 
-    'ksvg2/svg/SVGMatrix.idl',
-    'ksvg2/svg/SVGPathSegList.idl',
-    'ksvg2/svg/SVGPointList.idl',
-    'ksvg2/svg/SVGTransformList.idl',
+    'ksvg2/svg/SVGMatrix.idl',                    # port only
+    'ksvg2/svg/SVGPathSegList.idl',               # port only
+    'ksvg2/svg/SVGPointList.idl',                 # port only
+    'ksvg2/svg/SVGTransformList.idl',             # port only
 
-    'svg/ElementTimeControl.idl',
+    'svg/SVGLength.idl',
+    'svg/SVGElement.idl',
     'svg/SVGAElement.idl',
-    'svg/SVGAltGlyphElement.idl',
+    'svg/SVGURIReference.idl',
+    'svg/SVGRect.idl',
+    'svg/SVGRectElement.idl',
+    'svg/SVGRenderingIntent.idl',
     'svg/SVGAngle.idl',
     'svg/SVGAnimateColorElement.idl',
+    'svg/SVGAnimateElement.idl',
+    'svg/SVGAnimateTransformElement.idl',
     'svg/SVGAnimatedAngle.idl',
     'svg/SVGAnimatedBoolean.idl',
     'svg/SVGAnimatedEnumeration.idl',
@@ -336,8 +338,6 @@ idl_files = [
     'svg/SVGAnimatedRect.idl',
     'svg/SVGAnimatedString.idl',
     'svg/SVGAnimatedTransformList.idl',
-    'svg/SVGAnimateElement.idl',
-    'svg/SVGAnimateTransformElement.idl',
     'svg/SVGAnimationElement.idl',
     'svg/SVGCircleElement.idl',
     'svg/SVGClipPathElement.idl',
@@ -376,26 +376,25 @@ idl_files = [
     'svg/SVGFESpotLightElement.idl',
     'svg/SVGFETileElement.idl',
     'svg/SVGFETurbulenceElement.idl',
-    'svg/SVGFFilterElement.idl',
-    'svg/SVGFFilterPrimitiveStandardAttributes.idl',
-    'svg/SVGFFitToViewBox.idl',
     'svg/SVGFontElement.idl',
     'svg/SVGFontFaceElement.idl',
     'svg/SVGFontFaceFormatElement.idl',
     'svg/SVGFontFaceNameElement.idl',
     'svg/SVGFontFaceSrcElement.idl',
     'svg/SVGFontFaceUriElement.idl',
+    'svg/SVGFilterElement.idl',
+    'svg/SVGFilterPrimitiveStandardAttributes.idl',
+    'svg/SVGFitToViewBox.idl',
     'svg/SVGForeignObjectElement.idl',
     'svg/SVGGElement.idl',
-    'svg/SVGGlpyhElement.idl',
+    'svg/SVGGlyphElement.idl',
     'svg/SVGGradientElement.idl',
-    'svg/SVGHKernElement.idl',
     'svg/SVGImageElement.idl',
     'svg/SVGLangSpace.idl',
     'svg/SVGLength.idl',
     'svg/SVGLengthList.idl',
-    'svg/SVGLinearGradientElement.idl',
     'svg/SVGLineElement.idl',
+    'svg/SVGLinearGradientElement.idl',
     'svg/SVGLocatable.idl',
     'svg/SVGMarkerElement.idl',
     'svg/SVGMaskElement.idl',
@@ -434,15 +433,17 @@ idl_files = [
     'svg/SVGRect.idl',
     'svg/SVGRectElement.idl',
     'svg/SVGRenderingIntent.idl',
+    'svg/SVGSVGElement.idl',
     'svg/SVGScriptElement.idl',
     'svg/SVGSetElement.idl',
     'svg/SVGStopElement.idl',
     'svg/SVGStringList.idl',
     'svg/SVGStylable.idl',
     'svg/SVGStyleElement.idl',
-    'svg/SVGSVGElement.idl',
     'svg/SVGSwitchElement.idl',
     'svg/SVGSymbolElement.idl',
+    'svg/SVGTRefElement.idl',
+    'svg/SVGTSpanElement.idl',
     'svg/SVGTests.idl',
     'svg/SVGTextContentElement.idl',
     'svg/SVGTextElement.idl',
@@ -451,29 +452,12 @@ idl_files = [
     'svg/SVGTitleElement.idl',
     'svg/SVGTransform.idl',
     'svg/SVGTransformable.idl',
-    'svg/SVGTRefElement.idl',
-    'svg/SVGTSpanElement.idl',
-    'svg/SVGUnitTypes.idl',
     'svg/SVGURIReference.idl',
+    'svg/SVGUnitTypes.idl',
     'svg/SVGUseElement.idl',
     'svg/SVGViewElement.idl',
-    'svg/SVGViewSpec.idl',
     'svg/SVGZoomAndPan.idl',
     'svg/SVGZoomEvent.idl',
-
-    'xml/DOMParser.idl',
-    'xml/DOMParser.idl',
-    'xml/XMLHttpRequest.idl',
-    'xml/XMLHttpRequestException.idl',
-    'xml/XMLHttpRequestProgressEvent.idl',
-    'xml/XMLHttpRequestUpload.idl',
-    'xml/XMLSerializer.idl',
-    'xml/XPathEvaluator.idl',
-    'xml/XPathException.idl',
-    'xml/XPathExpression.idl',
-    'xml/XPathNSResolver.idl',
-    'xml/XPathResult.idl',
-    'xml/XSLTProcessor.idl',
 ]
 
 for subdir in set([os.path.dirname(n) for n in idl_files]):
@@ -619,7 +603,7 @@ env.Command('$WEBKIT_PORT_DIR/CSSPropertyNames.in',
 env.Command(['$DERIVED_DIR/CSSValueKeywords.c',
              '$DERIVED_DIR/CSSValueKeywords.h'],
             ['$WEBKIT_PORT_DIR/css/makevalues.pl',
-             '$WEBKIT_PORT_DIR/CSSValueKeywords.in'],
+             '$WEBKIT_PORT_DIR/css/CSSValueKeywords.in'],
             ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}',
              Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'),
              Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'),
@@ -628,7 +612,7 @@ env.Command(['$DERIVED_DIR/CSSValueKeywords.c',
 env.Command(['$DERIVED_DIR/CSSPropertyNames.cpp',
              '$DERIVED_DIR/CSSPropertyNames.h'],
             ['$WEBKIT_PORT_DIR/css/makeprop.pl',
-             '$WEBKIT_PORT_DIR/CSSPropertyNames.in'],
+             '$WEBKIT_PORT_DIR/css/CSSPropertyNames.in'],
             ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}',
              Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'),
              Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'),