| OLD | NEW |
| 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 #if defined(OS_MACOSX) | 129 #if defined(OS_MACOSX) |
| 130 editing_behavior(EDITING_BEHAVIOR_MAC), | 130 editing_behavior(EDITING_BEHAVIOR_MAC), |
| 131 #elif defined(OS_WIN) | 131 #elif defined(OS_WIN) |
| 132 editing_behavior(EDITING_BEHAVIOR_WIN), | 132 editing_behavior(EDITING_BEHAVIOR_WIN), |
| 133 #elif defined(OS_POSIX) | 133 #elif defined(OS_POSIX) |
| 134 editing_behavior(EDITING_BEHAVIOR_UNIX), | 134 editing_behavior(EDITING_BEHAVIOR_UNIX), |
| 135 #else | 135 #else |
| 136 editing_behavior(EDITING_BEHAVIOR_MAC), | 136 editing_behavior(EDITING_BEHAVIOR_MAC), |
| 137 #endif | 137 #endif |
| 138 supports_multiple_windows(true), | 138 supports_multiple_windows(true), |
| 139 viewport_enabled(false), |
| 139 cookie_enabled(true) | 140 cookie_enabled(true) |
| 140 #if defined(OS_ANDROID) | 141 #if defined(OS_ANDROID) |
| 141 , | 142 , |
| 142 text_autosizing_enabled(true), | 143 text_autosizing_enabled(true), |
| 143 font_scale_factor(1.0f), | 144 font_scale_factor(1.0f), |
| 144 force_enable_zoom(false), | 145 force_enable_zoom(false), |
| 145 user_gesture_required_for_media_playback(true) | 146 user_gesture_required_for_media_playback(true) |
| 146 #endif | 147 #endif |
| 147 { | 148 { |
| 148 standard_font_family_map[kCommonScript] = | 149 standard_font_family_map[kCommonScript] = |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 fixed_position_creates_stacking_context); | 460 fixed_position_creates_stacking_context); |
| 460 | 461 |
| 461 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); | 462 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); |
| 462 settings->setShouldRespectImageOrientation(should_respect_image_orientation); | 463 settings->setShouldRespectImageOrientation(should_respect_image_orientation); |
| 463 | 464 |
| 464 settings->setEditingBehavior( | 465 settings->setEditingBehavior( |
| 465 static_cast<WebSettings::EditingBehavior>(editing_behavior)); | 466 static_cast<WebSettings::EditingBehavior>(editing_behavior)); |
| 466 | 467 |
| 467 settings->setSupportsMultipleWindows(supports_multiple_windows); | 468 settings->setSupportsMultipleWindows(supports_multiple_windows); |
| 468 | 469 |
| 470 settings->setViewportEnabled(viewport_enabled); |
| 471 |
| 469 #if defined(OS_ANDROID) | 472 #if defined(OS_ANDROID) |
| 470 settings->setAllowCustomScrollbarInMainFrame(false); | 473 settings->setAllowCustomScrollbarInMainFrame(false); |
| 471 settings->setTextAutosizingEnabled(text_autosizing_enabled); | 474 settings->setTextAutosizingEnabled(text_autosizing_enabled); |
| 472 settings->setTextAutosizingFontScaleFactor(font_scale_factor); | 475 settings->setTextAutosizingFontScaleFactor(font_scale_factor); |
| 473 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); | 476 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); |
| 474 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 477 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
| 475 settings->setDoubleTapToZoomEnabled(true); | 478 settings->setDoubleTapToZoomEnabled(true); |
| 476 settings->setMediaPlaybackRequiresUserGesture( | 479 settings->setMediaPlaybackRequiresUserGesture( |
| 477 user_gesture_required_for_media_playback); | 480 user_gesture_required_for_media_playback); |
| 478 #endif | 481 #endif |
| 479 | 482 |
| 480 WebNetworkStateNotifier::setOnLine(is_online); | 483 WebNetworkStateNotifier::setOnLine(is_online); |
| 481 } | 484 } |
| 482 | 485 |
| 483 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ | 486 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ |
| 484 COMPILE_ASSERT( \ | 487 COMPILE_ASSERT( \ |
| 485 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ | 488 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ |
| 486 mismatching_enums) | 489 mismatching_enums) |
| 487 | 490 |
| 488 COMPILE_ASSERT_MATCHING_ENUMS( | 491 COMPILE_ASSERT_MATCHING_ENUMS( |
| 489 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 492 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
| 490 COMPILE_ASSERT_MATCHING_ENUMS( | 493 COMPILE_ASSERT_MATCHING_ENUMS( |
| 491 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 494 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
| 492 COMPILE_ASSERT_MATCHING_ENUMS( | 495 COMPILE_ASSERT_MATCHING_ENUMS( |
| 493 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 496 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
| 494 | 497 |
| 495 } // namespace webkit_glue | 498 } // namespace webkit_glue |
| OLD | NEW |