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

Side by Side Diff: content/test/layouttest_support.cc

Issue 1326623002: Moved render_font to a common location to share with other content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unused entries. Created 5 years, 3 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
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/public/test/layouttest_support.h" 5 #include "content/public/test/layouttest_support.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "components/test_runner/test_common.h" 9 #include "components/test_runner/test_common.h"
10 #include "components/test_runner/web_frame_test_proxy.h" 10 #include "components/test_runner/web_frame_test_proxy.h"
(...skipping 17 matching lines...) Expand all
28 #include "third_party/WebKit/public/platform/WebBatteryStatus.h" 28 #include "third_party/WebKit/public/platform/WebBatteryStatus.h"
29 #include "third_party/WebKit/public/platform/WebGamepads.h" 29 #include "third_party/WebKit/public/platform/WebGamepads.h"
30 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eMotionData.h" 30 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eMotionData.h"
31 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eOrientationData.h" 31 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eOrientationData.h"
32 #include "third_party/WebKit/public/web/WebHistoryItem.h" 32 #include "third_party/WebKit/public/web/WebHistoryItem.h"
33 #include "third_party/WebKit/public/web/WebView.h" 33 #include "third_party/WebKit/public/web/WebView.h"
34 34
35 #if defined(OS_MACOSX) 35 #if defined(OS_MACOSX)
36 #include "content/browser/frame_host/popup_menu_helper_mac.h" 36 #include "content/browser/frame_host/popup_menu_helper_mac.h"
37 #elif defined(OS_WIN) 37 #elif defined(OS_WIN)
38 #include "content/renderer/render_font_warmup_win.h" 38 #include "content/common/font_warmup_win.h"
39 #include "third_party/WebKit/public/web/win/WebFontRendering.h" 39 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
40 #include "third_party/skia/include/ports/SkFontMgr.h" 40 #include "third_party/skia/include/ports/SkFontMgr.h"
41 #include "ui/gfx/win/direct_write.h" 41 #include "ui/gfx/win/direct_write.h"
42 #endif 42 #endif
43 43
44 using blink::WebBatteryStatus; 44 using blink::WebBatteryStatus;
45 using blink::WebDeviceMotionData; 45 using blink::WebDeviceMotionData;
46 using blink::WebDeviceOrientationData; 46 using blink::WebDeviceOrientationData;
47 using blink::WebGamepad; 47 using blink::WebGamepad;
48 using blink::WebGamepads; 48 using blink::WebGamepads;
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 result.append( 450 result.append(
451 DumpHistoryItem(entry->root_history_node(), 451 DumpHistoryItem(entry->root_history_node(),
452 8, 452 8,
453 index == current_index)); 453 index == current_index));
454 } 454 }
455 result.append("===============================================\n"); 455 result.append("===============================================\n");
456 return result; 456 return result;
457 } 457 }
458 458
459 } // namespace content 459 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698