| 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 "chrome/renderer/render_thread.h" | 5 #include "chrome/renderer/render_thread.h" |
| 6 | 6 |
| 7 #include <v8.h> | |
| 8 | |
| 9 #include <algorithm> | 7 #include <algorithm> |
| 10 #include <limits> | 8 #include <limits> |
| 11 #include <map> | 9 #include <map> |
| 12 #include <vector> | 10 #include <vector> |
| 13 | 11 |
| 14 #if defined(USE_SYSTEM_SQLITE) | 12 #if defined(USE_SYSTEM_SQLITE) |
| 15 #include <sqlite3.h> | 13 #include <sqlite3.h> |
| 16 #else | 14 #else |
| 17 #include "third_party/sqlite/preprocessed/sqlite3.h" | 15 #include "third_party/sqlite/preprocessed/sqlite3.h" |
| 18 #endif | 16 #endif |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" | 71 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" |
| 74 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" | 72 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" |
| 75 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" | 73 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" |
| 76 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" | 74 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" |
| 77 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" | 75 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" |
| 78 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" | 76 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" |
| 79 #include "webkit/extensions/v8/benchmarking_extension.h" | 77 #include "webkit/extensions/v8/benchmarking_extension.h" |
| 80 #include "webkit/extensions/v8/gears_extension.h" | 78 #include "webkit/extensions/v8/gears_extension.h" |
| 81 #include "webkit/extensions/v8/interval_extension.h" | 79 #include "webkit/extensions/v8/interval_extension.h" |
| 82 #include "webkit/extensions/v8/playback_extension.h" | 80 #include "webkit/extensions/v8/playback_extension.h" |
| 81 #include "v8/include/v8.h" |
| 83 | 82 |
| 84 #if defined(OS_WIN) | 83 #if defined(OS_WIN) |
| 85 #include <windows.h> | 84 #include <windows.h> |
| 86 #include <objbase.h> | 85 #include <objbase.h> |
| 87 #endif | 86 #endif |
| 88 | 87 |
| 89 #if defined(OS_MACOSX) | 88 #if defined(OS_MACOSX) |
| 90 #include "chrome/app/breakpad_mac.h" | 89 #include "chrome/app/breakpad_mac.h" |
| 91 #endif | 90 #endif |
| 92 | 91 |
| (...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1002 #endif | 1001 #endif |
| 1003 | 1002 |
| 1004 if (channel_handle.name.size() != 0) { | 1003 if (channel_handle.name.size() != 0) { |
| 1005 // Connect to the GPU process if a channel name was received. | 1004 // Connect to the GPU process if a channel name was received. |
| 1006 gpu_channel_->Connect(channel_handle.name); | 1005 gpu_channel_->Connect(channel_handle.name); |
| 1007 } else { | 1006 } else { |
| 1008 // Otherwise cancel the connection. | 1007 // Otherwise cancel the connection. |
| 1009 gpu_channel_ = NULL; | 1008 gpu_channel_ = NULL; |
| 1010 } | 1009 } |
| 1011 } | 1010 } |
| OLD | NEW |