Get the majority of the files in V8Bindings/ building.

The rest are excluded from the linux build because they include 
windowisms; this will be fixed later.

Also, random linux compile fixes. Extra qualifiers, unused variables, et 
cetera.


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

11 files changed, 64 insertions, 43 deletions

diff --git a/webkit/SConscript b/webkit/SConscript
index f85b9af..b46b95d 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -210,7 +210,7 @@ else:
     'build/JavaScriptCore/SConscript',
 #    'build/localized_strings/SConscript',
     'build/port/SConscript',
-#    'build/V8Bindings/SConscript',
+    'build/V8Bindings/SConscript',
 #    'build/WebCore/SConscript',
     ]
 env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 2cc8a32..deeb930 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -35,7 +35,7 @@ if env['PLATFORM'] == 'win32':
   env.Prepend(
     CCFLAGS = [
       '/TP',
-              
+
       '/wd4244',
       '/wd4291',
       '/wd4345',
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 55bfa7a..dae91bf 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -31,7 +31,6 @@ Import('env')
 
 env = env.Clone()
 
-
 if env['PLATFORM'] == 'win32':
     env.Prepend(
         CPPDEFINES = [
@@ -49,26 +48,17 @@ if env['PLATFORM'] == 'win32':
                 '/wd4800',
                 ],
         )
+else:
+  # We need to include the parts of icu that we want here:
+  env.Append(
+    CPPPATH = [
+      '$ICU38_DIR/public/',
+      ])
+
+if env['PLATFORM'] == 'posix':
+  env.Append(CCFLAGS = '-Wno-unused-variable');
 
 inputs = [
-    '$DERIVED_DIR/V8MimeType.cpp',
-    '$DERIVED_DIR/V8MimeTypeArray.cpp',
-    '$PORT_DIR/bridge/V8Bridge.cpp',
-    '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp',
-    '$PORT_DIR/bindings/v8/v8_proxy.cpp',
-    '$PORT_DIR/bindings/v8/v8_nodefilter.cpp',
-    '$PORT_DIR/bindings/v8/v8_index.cpp',
-    '$PORT_DIR/bindings/v8/v8_events.cpp',
-    '$PORT_DIR/bindings/v8/v8_custom.cpp',
-    '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp',
-    '$PORT_DIR/page/inspector/InspectorController.cpp',
-    '$PORT_DIR/bindings/v8/v8_npobject.cpp',
-    '$PORT_DIR/bindings/v8/v8_np_utils.cpp',
-    '$PORT_DIR/bindings/v8/v8_helpers.cpp',
-    '$PORT_DIR/bindings/v8/npruntime.cpp',
-    '$PORT_DIR/bindings/v8/np_v8object.cpp',
-    '$PORT_DIR/page/Navigator.cpp',
-    '$PORT_DIR/page/Location.cpp',
     '$SHARED_DIR/PausedTimeouts.cpp',
     '$DERIVED_DIR/XPathGrammar.cpp',
     '$DERIVED_DIR/CSSGrammar.cpp',
@@ -199,23 +189,17 @@ inputs = [
     '$DERIVED_DIR/V8Range.cpp',
     '$DERIVED_DIR/V8ProgressEvent.cpp',
     '$DERIVED_DIR/V8ProcessingInstruction.cpp',
-    '$DERIVED_DIR/V8PluginArray.cpp',
-    '$DERIVED_DIR/V8Plugin.cpp',
     '$DERIVED_DIR/V8OverflowEvent.cpp',
     '$DERIVED_DIR/V8Notation.cpp',
     '$DERIVED_DIR/V8NodeList.cpp',
     '$DERIVED_DIR/V8NodeIterator.cpp',
     '$DERIVED_DIR/V8NodeFilter.cpp',
     '$DERIVED_DIR/V8Node.cpp',
-    '$DERIVED_DIR/V8Navigator.cpp',
     '$DERIVED_DIR/V8NamedNodeMap.cpp',
     '$DERIVED_DIR/V8MutationEvent.cpp',
-    '$DERIVED_DIR/V8MouseEvent.cpp',
     '$DERIVED_DIR/V8MessageEvent.cpp',
     '$DERIVED_DIR/V8MediaList.cpp',
-    '$DERIVED_DIR/V8Location.cpp',
     '$DERIVED_DIR/V8KeyboardEvent.cpp',
-    '$DERIVED_DIR/V8InspectorController.cpp',
     '$DERIVED_DIR/V8HTMLUListElement.cpp',
     '$DERIVED_DIR/V8HTMLTitleElement.cpp',
     '$DERIVED_DIR/V8HTMLTextAreaElement.cpp',
@@ -226,7 +210,6 @@ inputs = [
     '$DERIVED_DIR/V8HTMLTableCellElement.cpp',
     '$DERIVED_DIR/V8HTMLTableCaptionElement.cpp',
     '$DERIVED_DIR/V8HTMLStyleElement.cpp',
-    '$DERIVED_DIR/V8HTMLSelectionInputElement.cpp',
     '$DERIVED_DIR/V8HTMLSelectElement.cpp',
     '$DERIVED_DIR/V8HTMLScriptElement.cpp',
     '$DERIVED_DIR/V8HTMLQuoteElement.cpp',
@@ -247,8 +230,6 @@ inputs = [
     '$DERIVED_DIR/V8HTMLLIElement.cpp',
     '$DERIVED_DIR/V8HTMLLegendElement.cpp',
     '$DERIVED_DIR/V8HTMLLabelElement.cpp',
-    '$DERIVED_DIR/V8HTMLIsIndexElement.cpp',
-    '$DERIVED_DIR/V8HTMLInputElement.cpp',
     '$DERIVED_DIR/V8HTMLImageElement.cpp',
     '$DERIVED_DIR/V8HTMLIFrameElement.cpp',
     '$DERIVED_DIR/V8HTMLHtmlElement.cpp',
@@ -284,7 +265,6 @@ inputs = [
     '$DERIVED_DIR/V8EntityReference.cpp',
     '$DERIVED_DIR/V8Entity.cpp',
     '$DERIVED_DIR/V8Element.cpp',
-    '$DERIVED_DIR/V8DOMWindow.cpp',
     '$DERIVED_DIR/V8DOMSelection.cpp',
     '$DERIVED_DIR/V8DOMParser.cpp',
     '$DERIVED_DIR/V8DOMImplementation.cpp',
@@ -308,7 +288,6 @@ inputs = [
     '$DERIVED_DIR/V8Counter.cpp',
     '$DERIVED_DIR/V8Console.cpp',
     '$DERIVED_DIR/V8Comment.cpp',
-    '$DERIVED_DIR/V8Clipboard.cpp',
     '$DERIVED_DIR/V8CharacterData.cpp',
     '$DERIVED_DIR/V8CDATASection.cpp',
     '$DERIVED_DIR/V8CanvasRenderingContext2D.cpp',
@@ -320,7 +299,41 @@ inputs = [
     '$DERIVED_DIR/SVGNames.cpp',
     '$DERIVED_DIR/SVGElementFactory.cpp',
     '$DERIVED_DIR/HTMLNames.cpp',
-]
+    ]
 
+# TODO(erg): Get Frame.h ported and half of this should compile. Get whatever
+#            String.h is referenced below and the other half should compile
+if env['PLATFORM'] == 'win32':
+  inputs = [
+    '$DERIVED_DIR/V8Clipboard.cpp',
+    '$DERIVED_DIR/V8DOMWindow.cpp',
+    '$DERIVED_DIR/V8HTMLInputElement.cpp',
+    '$DERIVED_DIR/V8HTMLIsIndexElement.cpp',
+    '$DERIVED_DIR/V8HTMLSelectionInputElement.cpp',
+    '$DERIVED_DIR/V8InspectorController.cpp',
+    '$DERIVED_DIR/V8Location.cpp',
+    '$DERIVED_DIR/V8MimeType.cpp',
+    '$DERIVED_DIR/V8MimeTypeArray.cpp',
+    '$DERIVED_DIR/V8MouseEvent.cpp',
+    '$DERIVED_DIR/V8Navigator.cpp',
+    '$DERIVED_DIR/V8Plugin.cpp',
+    '$DERIVED_DIR/V8PluginArray.cpp',
+    '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp',
+    '$PORT_DIR/bindings/v8/np_v8object.cpp',
+    '$PORT_DIR/bindings/v8/npruntime.cpp',
+    '$PORT_DIR/bindings/v8/v8_custom.cpp',
+    '$PORT_DIR/bindings/v8/v8_events.cpp',
+    '$PORT_DIR/bindings/v8/v8_helpers.cpp',
+    '$PORT_DIR/bindings/v8/v8_index.cpp',
+    '$PORT_DIR/bindings/v8/v8_nodefilter.cpp',
+    '$PORT_DIR/bindings/v8/v8_np_utils.cpp',
+    '$PORT_DIR/bindings/v8/v8_npobject.cpp',
+    '$PORT_DIR/bindings/v8/v8_proxy.cpp',
+    '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp',
+    '$PORT_DIR/bridge/V8Bridge.cpp',
+    '$PORT_DIR/page/Location.cpp',
+    '$PORT_DIR/page/Navigator.cpp',
+    '$PORT_DIR/page/inspector/InspectorController.cpp',
+    ]
 
 env.ChromeStaticLibrary('V8Bindings', inputs)
diff --git a/webkit/pending/FramePrivate.h b/webkit/pending/FramePrivate.h
index 196f789..7220b3f 100644
--- a/webkit/pending/FramePrivate.h
+++ b/webkit/pending/FramePrivate.h
@@ -63,7 +63,7 @@ namespace WebCore {
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
     typedef HashMap<void*, RefPtr<KJS::Bindings::RootObject> > RootObjectMap;
-#else if USE(V8_BINDING)
+#elif USE(V8_BINDING)
     typedef HashMap<void*, NPObject* > PluginObjectMap;
 #endif
 
@@ -123,7 +123,7 @@ namespace WebCore {
         // The root object used for objects bound outside the context of a plugin.
         RefPtr<KJS::Bindings::RootObject> m_bindingRootObject; 
         RootObjectMap m_rootObjects;
-#else if USE(V8_BINDING)
+#elif USE(V8_BINDING)
         // A mapping between Widgets and their corresponding script object.
         // This list is used so that when the plugin dies, we can immediately
         // invalidate all sub-objects which are associated with that plugin.
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index b77ab0d..5cc176c 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -230,7 +230,7 @@ sub GetImplementationFileName
     return "Event.h" if $iface eq "DOMTimeStamp";
     return "NamedAttrMap.h" if $iface eq "NamedNodeMap";
     return "NameNodeList.h" if $iface eq "NodeList";
-    return "xmlhttprequest.h" if $iface eq "XMLHttpRequest";
+    return "XMLHttpRequest.h" if $iface eq "XMLHttpRequest";
 
     return "${iface}.h";
 }
diff --git a/webkit/port/bindings/v8/v8_binding.h b/webkit/port/bindings/v8/v8_binding.h
index 922205d..92f1186 100644
--- a/webkit/port/bindings/v8/v8_binding.h
+++ b/webkit/port/bindings/v8/v8_binding.h
@@ -30,6 +30,8 @@
 #ifndef V8_BINDING_H__
 #define V8_BINDING_H__
 
+#include "build/build_config.h"
+
 #include <v8.h>
 #include "PlatformString.h"
 #include "MathExtras.h"
@@ -41,7 +43,14 @@
 #include "CString.h"
 #pragma warning(pop)
 
+#if defined(OS_LINUX)
+// Use the platform.h for linux.
+#include "common/unicode/plinux.h"
+#elif defined(OS_WIN) || defined(OS_MACOSX)
+// WebKit ships a hacked up version of one of the ICU header files, with all
+// options set for OSX.
 #include "platform.h"
+#endif
 
 namespace WebCore {
 
diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index bfcb7e0..e993749 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -72,7 +72,7 @@
 #include "EventTargetNode.h"
 #include "EventTarget.h"
 #include "ExceptionCode.h"
-#include "xmlhttprequest.h"
+#include "XMLHttpRequest.h"
 #include "XMLSerializer.h"
 #include "KURL.h"
 #include "DeprecatedString.h"
diff --git a/webkit/port/bridge/HistoryWin.cpp b/webkit/port/bridge/HistoryWin.cpp
index eafc142..0a835ba 100644
--- a/webkit/port/bridge/HistoryWin.cpp
+++ b/webkit/port/bridge/HistoryWin.cpp
@@ -20,7 +20,7 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
@@ -36,7 +36,7 @@
 
 namespace WebCore {
 
-bool historyContains(const UChar* characters, unsigned length,                      
+bool historyContains(const UChar* characters, unsigned length,
                      Document* document) {
   // check the document's DNS prefetch settings and pass up to the renderer
   CString document_host = document->securityOrigin()->host().utf8();
@@ -46,4 +46,4 @@ bool historyContains(const UChar* characters, unsigned length,
       document->isDNSPrefetchEnabled());
 }
 
-}
\ No newline at end of file
+}
diff --git a/webkit/port/platform/ThemeData.h b/webkit/port/platform/ThemeData.h
index 61614d7..46ac50f 100644
--- a/webkit/port/platform/ThemeData.h
+++ b/webkit/port/platform/ThemeData.h
@@ -38,4 +38,4 @@ struct ThemeData {
     unsigned m_classicState;
 };
 
-#endif  // ThemeData_h
\ No newline at end of file
+#endif  // ThemeData_h
diff --git a/webkit/port/platform/image-decoders/ImageDecoder.h b/webkit/port/platform/image-decoders/ImageDecoder.h
index 0a8a17b..5d05e25 100644
--- a/webkit/port/platform/image-decoders/ImageDecoder.h
+++ b/webkit/port/platform/image-decoders/ImageDecoder.h
@@ -215,7 +215,7 @@ private:
 class ImageDecoder
 {
 public:
-    ImageDecoder() :m_sizeAvailable(false), m_failed(false) {}
+    ImageDecoder() : m_failed(false), m_sizeAvailable(false)  {}
     virtual ~ImageDecoder() {}
 
     // All specific decoder plugins must do something with the data they are given.
diff --git a/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.cpp b/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.cpp
index f0c5789..aef0681 100644
--- a/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.cpp
+++ b/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.cpp
@@ -228,7 +228,6 @@ bool XBMImageDecoder::decodeData()
     ASSERT(frame.status() == RGBA32Buffer::FramePartial);
 
     const int bitsPerRow = size().width();
-    const int totalBits = bitsPerRow * size().height();
 
     ASSERT(m_dataType != UNKNOWN);