Include chrome/renderer/SConscript in Linux build. Patch by Paweł Hajdan jr

<phajdan.jr@gmail.com>.  Review: http://codereview.chromium.org/7822.


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

7 files changed, 52 insertions, 41 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 9b00f21..6a0e61e 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -425,6 +425,7 @@ sconscript_files = [
     'browser/SConscript',
     'common/SConscript',
     'plugin/SConscript',
+    'renderer/SConscript',
     'test/chrome_plugin/SConscript',
     'third_party/hunspell/SConscript',
     '$THIRD_PARTY_DIR/sqlite/SConscript',
@@ -439,7 +440,6 @@ if env['PLATFORM'] == 'win32':
       'installer/mini_installer/SConscript',
       'installer/setup/SConscript',
       'installer/util/SConscript',
-      'renderer/SConscript',
       'test/activex_test_control/SConscript',
       'test/automation/SConscript',
       'test/interactive_ui/SConscript',
diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript
index c6f56bc..4beed7b 100644
--- a/chrome/renderer/SConscript
+++ b/chrome/renderer/SConscript
@@ -16,11 +16,15 @@ env.Prepend(
     CPPDEFINES = [
         'U_STATIC_IMPLEMENTATION',
     ],
-    CCFLAGS = [
-        '/TP',
-    ],
 )
 
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
+      CCGLAGS = [
+          '/TP',
+      ],
+  )
+
 env.Append(
     CPPPATH = [
         'third_party/wtl/include',
@@ -33,27 +37,37 @@ env.Append(
     ],
 )
 
-input_files = [
-    'about_handler.cc',
-    'automation/dom_automation_controller.cc',
-    'chrome_plugin_host.cc',
-    'debug_message_handler.cc',
-    'dom_ui_bindings.cc',
-    'external_js_object.cc',
-    'external_host_bindings.cc',
-    'localized_error.cc',
-    'net/render_dns_master.cc',
-    'net/render_dns_queue.cc',
-    'plugin_channel_host.cc',
-    'render_process.cc',
-    'render_thread.cc',
-    'render_view.cc',
-    'render_widget.cc',
-    'renderer_glue.cc',
-    'renderer_main.cc',
-    'visitedlink_slave.cc',
-    'webplugin_delegate_proxy.cc',
-]
-
-env.ChromeStaticLibrary('renderer', input_files)
+input_files = []
+
+# TODO(port): Port to Mac.
+if env['PLATFORM'] in ('posix', 'win32'):
+  input_files.extend([
+      'about_handler.cc',
+      'net/render_dns_queue.cc',
+      'visitedlink_slave.cc',
+  ])
+
+# TODO(port): Port these.
+if env['PLATFORM'] == 'win32':
+  input_files.extend([
+      'automation/dom_automation_controller.cc',
+      'chrome_plugin_host.cc',
+      'debug_message_handler.cc',
+      'dom_ui_bindings.cc',
+      'external_js_object.cc',
+      'external_host_bindings.cc',
+      'localized_error.cc',
+      'net/render_dns_master.cc',
+      'plugin_channel_host.cc',
+      'render_process.cc',
+      'render_thread.cc',
+      'render_view.cc',
+      'render_widget.cc',
+      'renderer_glue.cc',
+      'renderer_main.cc',
+      'webplugin_delegate_proxy.cc',
+  ])
 
+# TODO(port): Enable for Mac.
+if env['PLATFORM'] in ('posix', 'win32'):
+  env.ChromeStaticLibrary('renderer', input_files)
diff --git a/chrome/renderer/about_handler.cc b/chrome/renderer/about_handler.cc
index 0f8401f..ff26d85 100644
--- a/chrome/renderer/about_handler.cc
+++ b/chrome/renderer/about_handler.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <windows.h>
-
 #include "chrome/renderer/about_handler.h"
 
+#include "base/platform_thread.h"
 #include "googleurl/src/gurl.h"
 
 struct AboutHandlerUrl {
-  char *url;
+  const char *url;
   void (*action)();
 };
 
@@ -58,12 +57,12 @@ void AboutHandler::AboutCrash() {
 // static
 void AboutHandler::AboutHang() {
   for (;;) {
-    Sleep(1000);
+    PlatformThread::Sleep(1000);
   }
 }
 
 // static
 void AboutHandler::AboutShortHang() {
-  Sleep(20000);
+  PlatformThread::Sleep(20000);
 }
 
diff --git a/chrome/renderer/net/render_dns_queue.cc b/chrome/renderer/net/render_dns_queue.cc
index 0f7a1bb..5a0b15e0 100644
--- a/chrome/renderer/net/render_dns_queue.cc
+++ b/chrome/renderer/net/render_dns_queue.cc
@@ -67,7 +67,8 @@ DnsQueue::PushResult DnsQueue::Push(const char* source,
     std::memcpy(&buffer_[dest], source, space_till_wrap);
     // Ensure caller didn't have embedded '\0' and also
     // ensure trailing sentinel was in place.
-    DCHECK(space_till_wrap == strlen(&buffer_[dest]));  // Relies on sentinel.
+    // Relies on sentinel.
+    DCHECK(static_cast<size_t>(space_till_wrap) == strlen(&buffer_[dest]));
 
     length -= space_till_wrap;
     source += space_till_wrap;
@@ -78,7 +79,8 @@ DnsQueue::PushResult DnsQueue::Push(const char* source,
   std::memcpy(&buffer_[dest], source, length);
   DCHECK(dest + length < buffer_sentinel_);
   buffer_[dest + length] = '\0';  // We need termination in our buffer.
-  DCHECK(length == strlen(&buffer_[dest]));  // Preclude embedded '\0'.
+  // Preclude embedded '\0'.
+  DCHECK(static_cast<size_t>(length) == strlen(&buffer_[dest]));
 
   dest += length + 1;
   if (dest == buffer_sentinel_)
diff --git a/chrome/renderer/net/render_dns_queue.h b/chrome/renderer/net/render_dns_queue.h
index dad921d..a13be8c 100644
--- a/chrome/renderer/net/render_dns_queue.h
+++ b/chrome/renderer/net/render_dns_queue.h
@@ -75,8 +75,8 @@ class DnsQueue {
  private:
   bool Validate();  // Checks that all internal data is valid.
 
-  const BufferSize buffer_size_;  // Size one smaller than allocated space.
   const scoped_array<char> buffer_;  // Circular buffer, plus extra char ('\0').
+  const BufferSize buffer_size_;  // Size one smaller than allocated space.
   const BufferSize buffer_sentinel_;  // Index of extra '\0' at end of buffer_.
 
   // If writable_ == readable_, then the buffer is empty.
diff --git a/chrome/renderer/visitedlink_slave.cc b/chrome/renderer/visitedlink_slave.cc
index e619b30..3c928f9 100644
--- a/chrome/renderer/visitedlink_slave.cc
+++ b/chrome/renderer/visitedlink_slave.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <windows.h>
+#include "chrome/renderer/visitedlink_slave.h"
+
 #include "base/logging.h"
 #include "base/shared_memory.h"
-#include "chrome/common/win_util.h"
-#include "chrome/renderer/visitedlink_slave.h"
 
 VisitedLinkSlave::VisitedLinkSlave() : shared_memory_(NULL) {
 }
diff --git a/chrome/renderer/visitedlink_slave.h b/chrome/renderer/visitedlink_slave.h
index 4551a95..ff5ff64 100644
--- a/chrome/renderer/visitedlink_slave.h
+++ b/chrome/renderer/visitedlink_slave.h
@@ -5,9 +5,6 @@
 #ifndef CHROME_WIN_RENDERER_VISITEDLINK_SLAVE_H__
 #define CHROME_WIN_RENDERER_VISITEDLINK_SLAVE_H__
 
-#include <string>
-#include <windows.h>
-
 #include "base/shared_memory.h"
 #include "chrome/common/visitedlink_common.h"