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

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

Issue 3945002: Move debug-related stuff from base to the base/debug directory and use the... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 2 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
« no previous file with comments | « net/url_request/url_request.h ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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
11 #include <math.h> 11 #include <math.h>
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/debug/trace_event.h"
15 #include "base/lock.h" 16 #include "base/lock.h"
16 #include "base/message_loop.h" 17 #include "base/message_loop.h"
17 #include "base/metrics/stats_counters.h" 18 #include "base/metrics/stats_counters.h"
18 #include "base/process_util.h" 19 #include "base/process_util.h"
19 #include "base/platform_file.h" 20 #include "base/platform_file.h"
20 #include "base/singleton.h" 21 #include "base/singleton.h"
21 #include "base/string_number_conversions.h" 22 #include "base/string_number_conversions.h"
22 #include "base/string_util.h" 23 #include "base/string_util.h"
23 #include "base/time.h" 24 #include "base/time.h"
24 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
25 #include "base/trace_event.h"
26 #include "grit/webkit_resources.h" 26 #include "grit/webkit_resources.h"
27 #include "grit/webkit_strings.h" 27 #include "grit/webkit_strings.h"
28 #include "third_party/WebKit/WebKit/chromium/public/WebCookie.h" 28 #include "third_party/WebKit/WebKit/chromium/public/WebCookie.h"
29 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" 29 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
30 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" 30 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
31 #include "third_party/WebKit/WebKit/chromium/public/WebPluginListBuilder.h" 31 #include "third_party/WebKit/WebKit/chromium/public/WebPluginListBuilder.h"
32 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" 32 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
33 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" 33 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
34 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h" 34 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
35 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" 35 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 ++shared_timer_suspended_; 455 ++shared_timer_suspended_;
456 } 456 }
457 457
458 void WebKitClientImpl::ResumeSharedTimer() { 458 void WebKitClientImpl::ResumeSharedTimer() {
459 // The shared timer may have fired or been adjusted while we were suspended. 459 // The shared timer may have fired or been adjusted while we were suspended.
460 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 460 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
461 setSharedTimerFireTime(shared_timer_fire_time_); 461 setSharedTimerFireTime(shared_timer_fire_time_);
462 } 462 }
463 463
464 } // namespace webkit_glue 464 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « net/url_request/url_request.h ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698