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

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

Issue 11759023: [Android WebView] Implement WebSettings.{get|set}UseWideViewport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix tests that were expecting UseWideViewPort=true Created 7 years, 11 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/webpreferences.h ('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 "webkit/glue/webpreferences.h" 5 #include "webkit/glue/webpreferences.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 #if defined(OS_MACOSX) 131 #if defined(OS_MACOSX)
132 editing_behavior(EDITING_BEHAVIOR_MAC), 132 editing_behavior(EDITING_BEHAVIOR_MAC),
133 #elif defined(OS_WIN) 133 #elif defined(OS_WIN)
134 editing_behavior(EDITING_BEHAVIOR_WIN), 134 editing_behavior(EDITING_BEHAVIOR_WIN),
135 #elif defined(OS_POSIX) 135 #elif defined(OS_POSIX)
136 editing_behavior(EDITING_BEHAVIOR_UNIX), 136 editing_behavior(EDITING_BEHAVIOR_UNIX),
137 #else 137 #else
138 editing_behavior(EDITING_BEHAVIOR_MAC), 138 editing_behavior(EDITING_BEHAVIOR_MAC),
139 #endif 139 #endif
140 supports_multiple_windows(true), 140 supports_multiple_windows(true),
141 viewport_enabled(false),
141 cookie_enabled(true) 142 cookie_enabled(true)
142 #if defined(OS_ANDROID) 143 #if defined(OS_ANDROID)
143 , 144 ,
144 text_autosizing_enabled(true), 145 text_autosizing_enabled(true),
145 font_scale_factor(1.0f), 146 font_scale_factor(1.0f),
146 force_enable_zoom(false), 147 force_enable_zoom(false),
147 user_gesture_required_for_media_playback(true) 148 user_gesture_required_for_media_playback(true)
148 #endif 149 #endif
149 { 150 {
150 standard_font_family_map[kCommonScript] = 151 standard_font_family_map[kCommonScript] =
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 fixed_position_creates_stacking_context); 469 fixed_position_creates_stacking_context);
469 470
470 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); 471 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
471 settings->setShouldRespectImageOrientation(should_respect_image_orientation); 472 settings->setShouldRespectImageOrientation(should_respect_image_orientation);
472 473
473 settings->setEditingBehavior( 474 settings->setEditingBehavior(
474 static_cast<WebSettings::EditingBehavior>(editing_behavior)); 475 static_cast<WebSettings::EditingBehavior>(editing_behavior));
475 476
476 settings->setSupportsMultipleWindows(supports_multiple_windows); 477 settings->setSupportsMultipleWindows(supports_multiple_windows);
477 478
479 settings->setViewportEnabled(viewport_enabled);
480
478 #if defined(OS_ANDROID) 481 #if defined(OS_ANDROID)
479 settings->setAllowCustomScrollbarInMainFrame(false); 482 settings->setAllowCustomScrollbarInMainFrame(false);
480 settings->setTextAutosizingEnabled(text_autosizing_enabled); 483 settings->setTextAutosizingEnabled(text_autosizing_enabled);
481 settings->setTextAutosizingFontScaleFactor(font_scale_factor); 484 settings->setTextAutosizingFontScaleFactor(font_scale_factor);
482 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); 485 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
483 settings->setAutoZoomFocusedNodeToLegibleScale(true); 486 settings->setAutoZoomFocusedNodeToLegibleScale(true);
484 settings->setDoubleTapToZoomEnabled(true); 487 settings->setDoubleTapToZoomEnabled(true);
485 settings->setMediaPlaybackRequiresUserGesture( 488 settings->setMediaPlaybackRequiresUserGesture(
486 user_gesture_required_for_media_playback); 489 user_gesture_required_for_media_playback);
487 #endif 490 #endif
488 491
489 WebNetworkStateNotifier::setOnLine(is_online); 492 WebNetworkStateNotifier::setOnLine(is_online);
490 } 493 }
491 494
492 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ 495 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \
493 COMPILE_ASSERT( \ 496 COMPILE_ASSERT( \
494 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ 497 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \
495 mismatching_enums) 498 mismatching_enums)
496 499
497 COMPILE_ASSERT_MATCHING_ENUMS( 500 COMPILE_ASSERT_MATCHING_ENUMS(
498 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 501 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
499 COMPILE_ASSERT_MATCHING_ENUMS( 502 COMPILE_ASSERT_MATCHING_ENUMS(
500 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 503 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
501 COMPILE_ASSERT_MATCHING_ENUMS( 504 COMPILE_ASSERT_MATCHING_ENUMS(
502 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 505 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
503 506
504 } // namespace webkit_glue 507 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698