Unix ifdefs patch for ui/ and webkit/

webkit/glue/webkitclient_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webkitclient_impl.h"
 
 #if defined(OS_LINUX)
 #include <malloc.h>
 #endif
 
@@ skipping 25 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "webkit/glue/media/audio_decoder.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/websocketstreamhandle_impl.h"
 #include "webkit/glue/weburlloader_impl.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)

[Lei Zhang, 2011/05/24 00:11:32]

there's no reason to do this unless you also fix the #if at line 517.

 #include "v8/include/v8.h"
 #endif
 
 using WebKit::WebAudioBus;
 using WebKit::WebCookie;
 using WebKit::WebData;
 using WebKit::WebLocalizedString;
 using WebKit::WebPluginListBuilder;
 using WebKit::WebString;
 using WebKit::WebSocketStreamHandle;
@@ skipping 142 matching lines @@
     : main_loop_(MessageLoop::current()),
       shared_timer_func_(NULL),
       shared_timer_fire_time_(0.0),
       shared_timer_suspended_(0) {
 }
 
 WebKitClientImpl::~WebKitClientImpl() {
 }
 
 WebThemeEngine* WebKitClientImpl::themeEngine() {
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_POSIX)

[Lei Zhang, 2011/05/24 00:11:32]

ditto, the code won't even compile, so why bother with the #if and the entire
#else section.

   return &theme_engine_;
 #else
   return NULL;
 #endif
 }
 
 WebURLLoader* WebKitClientImpl::createURLLoader() {
   return new WebURLLoaderImpl();
 }
 
@@ skipping 365 matching lines @@
   ++shared_timer_suspended_;
 }
 
 void WebKitClientImpl::ResumeSharedTimer() {
   // The shared timer may have fired or been adjusted while we were suspended.
   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
     setSharedTimerFireTime(shared_timer_fire_time_);
 }
 
 }  // namespace webkit_glue