Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / renderer / web_preferences.cc

diff --git a/src/content/renderer/web_preferences.cc b/src/content/renderer/web_preferences.cc
index 33882e3..2c6c959 100644 (file)
--- a/src/content/renderer/web_preferences.cc
+++ b/src/content/renderer/web_preferences.cc
@@ -163,12 +163,6 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
   settings->setCookieEnabled(prefs.cookie_enabled);
   settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);
 
-  // This setting affects the behavior of links in an editable region:
-  // clicking the link should select it rather than navigate to it.
-  // Safari uses the same default. It is unlikley an embedder would want to
-  // change this, since it would break existing rich text editors.
-  settings->setEditableLinkBehaviorNeverLive();
-
   settings->setJavaEnabled(prefs.java_enabled);
 
   // By default, allow_universal_access_from_file_urls is set to false and thus
@@ -205,13 +199,8 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
 
   settings->setThreadedHTMLParser(prefs.threaded_html_parser);
 
-  // Display visualization of what has changed on the screen using an
-  // overlay of rects, if requested on the command line.
-  settings->setShowPaintRects(prefs.show_paint_rects);
-
-  // Enable gpu-accelerated compositing if requested on the command line.
-  settings->setAcceleratedCompositingEnabled(
-      prefs.accelerated_compositing_enabled);
+  // Enable gpu-accelerated compositing always.
+  settings->setAcceleratedCompositingEnabled(true);
 
   // Enable gpu-accelerated 2d canvas if requested on the command line.
   settings->setAccelerated2dCanvasEnabled(prefs.accelerated_2d_canvas_enabled);
@@ -231,21 +220,16 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
   // Enable deferred filter rendering if requested on the command line.
   settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled);
 
+  // Enable container culling if requested on the command line.
+  settings->setContainerCullingEnabled(prefs.container_culling_enabled);
+
   // Enable gesture tap highlight if requested on the command line.
   settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled);
 
   // Enabling accelerated layers from the command line enabled accelerated
-  // 3D CSS, Video, and Animations.
-  settings->setAcceleratedCompositingFor3DTransformsEnabled(
-      prefs.accelerated_compositing_for_3d_transforms_enabled);
+  // Video.
   settings->setAcceleratedCompositingForVideoEnabled(
       prefs.accelerated_compositing_for_video_enabled);
-  settings->setAcceleratedCompositingForAnimationEnabled(
-      prefs.accelerated_compositing_for_animation_enabled);
-
-  // Enabling accelerated plugins if specified from the command line.
-  settings->setAcceleratedCompositingForPluginsEnabled(
-      prefs.accelerated_compositing_for_plugins_enabled);
 
   // WebGL and accelerated 2D canvas are always gpu composited.
   settings->setAcceleratedCompositingForCanvasEnabled(
@@ -267,8 +251,6 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
   // ChromeClient::tabsToLinks which is part of the glue code.
   web_view->setTabsToLinks(prefs.tabs_to_links);
 
-  // TODO(scheib): crbug.com/344002 Remove FullScreenEnabled from Blink
-  settings->setFullScreenEnabled(true);
   settings->setAllowDisplayOfInsecureContent(
       prefs.allow_displaying_insecure_content);
   settings->setAllowRunningOfInsecureContent(
@@ -278,7 +260,6 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
   settings->setShouldClearDocumentBackground(
       prefs.should_clear_document_background);
   settings->setEnableScrollAnimator(prefs.enable_scroll_animator);
-  settings->setVisualWordMovementEnabled(prefs.visual_word_movement_enabled);
 
   settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled);
 
@@ -316,7 +297,6 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
   settings->setSelectionIncludesAltImageText(true);
 
   // Crosswalk shared settings:
-  settings->setLayoutFallbackWidth(0);
   settings->setMainFrameClipsContent(false);
 
 #if defined(OS_TIZEN)
@@ -338,10 +318,9 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
   web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom);
   settings->setAutoZoomFocusedNodeToLegibleScale(true);
   settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled);
+  settings->setMediaControlsOverlayPlayButtonEnabled(true);
   settings->setMediaPlaybackRequiresUserGesture(
       prefs.user_gesture_required_for_media_playback);
-  settings->setMediaFullscreenRequiresUserGesture(
-      prefs.user_gesture_required_for_media_fullscreen);
   settings->setDefaultVideoPosterURL(
         base::ASCIIToUTF16(prefs.default_video_poster_url.spec()));
   settings->setSupportDeprecatedTargetDensityDPI(
@@ -366,11 +345,10 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
       prefs.report_screen_size_in_physical_pixels_quirk);
   settings->setMainFrameClipsContent(false);
   settings->setShrinksStandaloneImagesToFit(false);
+  settings->setShrinksViewportContentToFit(true);
 #endif
 
   WebNetworkStateNotifier::setOnLine(prefs.is_online);
-  settings->setExperimentalWebSocketEnabled(
-      prefs.experimental_websocket_enabled);
   settings->setPinchVirtualViewportEnabled(
       prefs.pinch_virtual_viewport_enabled);
 
@@ -378,6 +356,8 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
       prefs.pinch_overlay_scrollbar_thickness);
   settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
   settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
+
+  settings->setUseThreadedHTMLParserForDataURLs(true);
 }
 
 }  // namespace content