Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(512)

Side by Side Diff: webkit/glue/webkitclient_impl.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/webkitclient_impl.h" 5 #include "webkit/glue/webkitclient_impl.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <malloc.h> 8 #include <malloc.h>
9 #endif 9 #endif
10 10
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 : main_loop_(MessageLoop::current()), 199 : main_loop_(MessageLoop::current()),
200 shared_timer_func_(NULL), 200 shared_timer_func_(NULL),
201 shared_timer_fire_time_(0.0), 201 shared_timer_fire_time_(0.0),
202 shared_timer_suspended_(0) { 202 shared_timer_suspended_(0) {
203 } 203 }
204 204
205 WebKitClientImpl::~WebKitClientImpl() { 205 WebKitClientImpl::~WebKitClientImpl() {
206 } 206 }
207 207
208 WebThemeEngine* WebKitClientImpl::themeEngine() { 208 WebThemeEngine* WebKitClientImpl::themeEngine() {
209 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
210 return &theme_engine_; 209 return &theme_engine_;
211 #else
212 return NULL;
213 #endif
214 } 210 }
215 211
216 WebURLLoader* WebKitClientImpl::createURLLoader() { 212 WebURLLoader* WebKitClientImpl::createURLLoader() {
217 return new WebURLLoaderImpl(); 213 return new WebURLLoaderImpl();
218 } 214 }
219 215
220 WebSocketStreamHandle* WebKitClientImpl::createSocketStreamHandle() { 216 WebSocketStreamHandle* WebKitClientImpl::createSocketStreamHandle() {
221 return new WebSocketStreamHandleImpl(); 217 return new WebSocketStreamHandleImpl();
222 } 218 }
223 219
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 ++shared_timer_suspended_; 581 ++shared_timer_suspended_;
586 } 582 }
587 583
588 void WebKitClientImpl::ResumeSharedTimer() { 584 void WebKitClientImpl::ResumeSharedTimer() {
589 // The shared timer may have fired or been adjusted while we were suspended. 585 // The shared timer may have fired or been adjusted while we were suspended.
590 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 586 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
591 setSharedTimerFireTime(shared_timer_fire_time_); 587 setSharedTimerFireTime(shared_timer_fire_time_);
592 } 588 }
593 589
594 } // namespace webkit_glue 590 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698