| OLD | NEW |
| 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/webkit_glue.h" | 5 #include "webkit/glue/webkit_glue.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <objidl.h> | 8 #include <objidl.h> |
| 9 #include <mlang.h> | 9 #include <mlang.h> |
| 10 #elif defined(OS_POSIX) && !defined(OS_MACOSX) | 10 #elif defined(OS_POSIX) && !defined(OS_MACOSX) |
| 11 #include <sys/utsname.h> | 11 #include <sys/utsname.h> |
| 12 #endif | 12 #endif |
| 13 | 13 |
| 14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/scoped_ptr.h" | 15 #include "base/scoped_ptr.h" |
| 16 #include "base/singleton.h" | 16 #include "base/singleton.h" |
| 17 #include "base/string_piece.h" | 17 #include "base/string_piece.h" |
| 18 #include "base/string_util.h" | 18 #include "base/string_util.h" |
| 19 #include "base/stringprintf.h" |
| 19 #include "base/sys_info.h" | 20 #include "base/sys_info.h" |
| 20 #include "base/sys_string_conversions.h" | 21 #include "base/sys_string_conversions.h" |
| 21 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
| 22 #include "net/base/escape.h" | 23 #include "net/base/escape.h" |
| 23 #include "skia/ext/platform_canvas.h" | 24 #include "skia/ext/platform_canvas.h" |
| 24 #if defined(OS_MACOSX) | 25 #if defined(OS_MACOSX) |
| 25 #include "skia/ext/skia_utils_mac.h" | 26 #include "skia/ext/skia_utils_mac.h" |
| 26 #endif | 27 #endif |
| 27 #include "third_party/skia/include/core/SkBitmap.h" | 28 #include "third_party/skia/include/core/SkBitmap.h" |
| 28 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" | 29 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 // test aren't inherited (otherwise can mistake single/double/triple clicks) | 250 // test aren't inherited (otherwise can mistake single/double/triple clicks) |
| 250 WebKit::WebInputEventFactory::resetLastClickState(); | 251 WebKit::WebInputEventFactory::resetLastClickState(); |
| 251 #endif | 252 #endif |
| 252 } | 253 } |
| 253 | 254 |
| 254 #ifndef NDEBUG | 255 #ifndef NDEBUG |
| 255 // The log macro was having problems due to collisions with WTF, so we just | 256 // The log macro was having problems due to collisions with WTF, so we just |
| 256 // code here what that would have inlined. | 257 // code here what that would have inlined. |
| 257 void DumpLeakedObject(const char* file, int line, const char* object, | 258 void DumpLeakedObject(const char* file, int line, const char* object, |
| 258 int count) { | 259 int count) { |
| 259 std::string msg = StringPrintf("%s LEAKED %d TIMES", object, count); | 260 std::string msg = base::StringPrintf("%s LEAKED %d TIMES", object, count); |
| 260 AppendToLog(file, line, msg.c_str()); | 261 AppendToLog(file, line, msg.c_str()); |
| 261 } | 262 } |
| 262 #endif | 263 #endif |
| 263 | 264 |
| 264 void CheckForLeaks() { | 265 void CheckForLeaks() { |
| 265 #ifndef NDEBUG | 266 #ifndef NDEBUG |
| 266 int count = WebFrame::instanceCount(); | 267 int count = WebFrame::instanceCount(); |
| 267 if (count) | 268 if (count) |
| 268 DumpLeakedObject(__FILE__, __LINE__, "WebFrame", count); | 269 DumpLeakedObject(__FILE__, __LINE__, "WebFrame", count); |
| 269 #endif | 270 #endif |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 | 400 |
| 400 bool IsMediaCacheEnabled() { | 401 bool IsMediaCacheEnabled() { |
| 401 return g_enable_media_cache; | 402 return g_enable_media_cache; |
| 402 } | 403 } |
| 403 | 404 |
| 404 void SetMediaCacheEnabled(bool enabled) { | 405 void SetMediaCacheEnabled(bool enabled) { |
| 405 g_enable_media_cache = enabled; | 406 g_enable_media_cache = enabled; |
| 406 } | 407 } |
| 407 | 408 |
| 408 } // namespace webkit_glue | 409 } // namespace webkit_glue |
| OLD | NEW |