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

Side by Side Diff: content/shell/webkit_test_helpers.cc

Issue 12314032: [content shell] enable touch events for layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | « content/shell/shell_main_delegate.cc ('k') | webkit/glue/webpreferences.h » ('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) 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/shell/webkit_test_helpers.h" 5 #include "content/shell/webkit_test_helpers.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Preferences.h" 8 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Preferences.h"
9 #include "webkit/glue/webpreferences.h" 9 #include "webkit/glue/webpreferences.h"
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 to->allow_running_insecure_content = from.allowRunningOfInsecureContent; 43 to->allow_running_insecure_content = from.allowRunningOfInsecureContent;
44 to->css_shaders_enabled = from.cssCustomFilterEnabled; 44 to->css_shaders_enabled = from.cssCustomFilterEnabled;
45 to->should_respect_image_orientation = from.shouldRespectImageOrientation; 45 to->should_respect_image_orientation = from.shouldRespectImageOrientation;
46 to->asynchronous_spell_checking_enabled = 46 to->asynchronous_spell_checking_enabled =
47 from.asynchronousSpellCheckingEnabled; 47 from.asynchronousSpellCheckingEnabled;
48 to->allow_file_access_from_file_urls = from.allowFileAccessFromFileURLs; 48 to->allow_file_access_from_file_urls = from.allowFileAccessFromFileURLs;
49 to->author_and_user_styles_enabled = from.authorAndUserStylesEnabled; 49 to->author_and_user_styles_enabled = from.authorAndUserStylesEnabled;
50 to->javascript_can_open_windows_automatically = 50 to->javascript_can_open_windows_automatically =
51 from.javaScriptCanOpenWindowsAutomatically; 51 from.javaScriptCanOpenWindowsAutomatically;
52 to->user_style_sheet_location = from.userStyleSheetLocation; 52 to->user_style_sheet_location = from.userStyleSheetLocation;
53 to->touch_drag_drop_enabled = from.touchDragDropEnabled;
53 } 54 }
54 55
55 // Applies settings that differ between layout tests and regular mode. Some 56 // Applies settings that differ between layout tests and regular mode. Some
56 // of the defaults are controlled via command line flags which are 57 // of the defaults are controlled via command line flags which are
57 // automatically set for layout tests. 58 // automatically set for layout tests.
58 void ApplyLayoutTestDefaultPreferences(webkit_glue::WebPreferences* prefs) { 59 void ApplyLayoutTestDefaultPreferences(webkit_glue::WebPreferences* prefs) {
59 prefs->allow_universal_access_from_file_urls = true; 60 prefs->allow_universal_access_from_file_urls = true;
60 prefs->dom_paste_enabled = true; 61 prefs->dom_paste_enabled = true;
61 prefs->javascript_can_access_clipboard = true; 62 prefs->javascript_can_access_clipboard = true;
62 prefs->xss_auditor_enabled = false; 63 prefs->xss_auditor_enabled = false;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ASCIIToUTF16("Courier"); 95 ASCIIToUTF16("Courier");
95 prefs->sans_serif_font_family_map[ 96 prefs->sans_serif_font_family_map[
96 webkit_glue::WebPreferences::kCommonScript] = ASCIIToUTF16("Helvetica"); 97 webkit_glue::WebPreferences::kCommonScript] = ASCIIToUTF16("Helvetica");
97 prefs->minimum_logical_font_size = 9; 98 prefs->minimum_logical_font_size = 9;
98 prefs->asynchronous_spell_checking_enabled = false; 99 prefs->asynchronous_spell_checking_enabled = false;
99 prefs->unified_textchecker_enabled = true; 100 prefs->unified_textchecker_enabled = true;
100 prefs->user_style_sheet_enabled = true; 101 prefs->user_style_sheet_enabled = true;
101 } 102 }
102 103
103 } // namespace content 104 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_main_delegate.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698