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

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

Issue 65012: Move skia to DEPS, and put it in third_party. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « webkit/glue/webcursor_win.cc ('k') | webkit/tools/layout_tests/test_expectations.txt » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "config.h" 5 #include "config.h"
6 #include "webkit/glue/webkit_glue.h" 6 #include "webkit/glue/webkit_glue.h"
7 7
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #include <objidl.h> 9 #include <objidl.h>
10 #include <mlang.h> 10 #include <mlang.h>
(...skipping 16 matching lines...) Expand all
27 #include "ScriptController.h" 27 #include "ScriptController.h"
28 #include "SharedBuffer.h" 28 #include "SharedBuffer.h"
29 29
30 #undef LOG 30 #undef LOG
31 #include "base/file_version_info.h" 31 #include "base/file_version_info.h"
32 #include "base/singleton.h" 32 #include "base/singleton.h"
33 #include "base/string_piece.h" 33 #include "base/string_piece.h"
34 #include "base/string_util.h" 34 #include "base/string_util.h"
35 #include "base/sys_info.h" 35 #include "base/sys_info.h"
36 #include "base/sys_string_conversions.h" 36 #include "base/sys_string_conversions.h"
37 #include "skia/include/SkBitmap.h" 37 #include "third_party/skia/include/core/SkBitmap.h"
38 #include "webkit/api/public/WebString.h" 38 #include "webkit/api/public/WebString.h"
39 #include "webkit/glue/event_conversion.h" 39 #include "webkit/glue/event_conversion.h"
40 #include "webkit/glue/glue_util.h" 40 #include "webkit/glue/glue_util.h"
41 #include "webkit/glue/weburlrequest_impl.h" 41 #include "webkit/glue/weburlrequest_impl.h"
42 #include "webkit/glue/webframe_impl.h" 42 #include "webkit/glue/webframe_impl.h"
43 #include "webkit/glue/webview_impl.h" 43 #include "webkit/glue/webview_impl.h"
44 44
45 #include "webkit_version.h" // Generated 45 #include "webkit_version.h" // Generated
46 46
47 //------------------------------------------------------------------------------ 47 //------------------------------------------------------------------------------
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 } 430 }
431 431
432 g_forcefully_terminate_plugin_process = value; 432 g_forcefully_terminate_plugin_process = value;
433 } 433 }
434 434
435 bool ShouldForcefullyTerminatePluginProcess() { 435 bool ShouldForcefullyTerminatePluginProcess() {
436 return g_forcefully_terminate_plugin_process; 436 return g_forcefully_terminate_plugin_process;
437 } 437 }
438 438
439 } // namespace webkit_glue 439 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webcursor_win.cc ('k') | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698