Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / chrome_restart_request.cc

diff --git a/src/chrome/browser/chromeos/login/chrome_restart_request.cc b/src/chrome/browser/chromeos/login/chrome_restart_request.cc
index 02757ab..c14bab8 100644 (file)
--- a/src/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/src/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -71,7 +71,6 @@ std::string DeriveCommandLine(const GURL& start_url,
 
   static const char* kForwardSwitches[] = {
     ::switches::kDisableAccelerated2dCanvas,
-    ::switches::kDisableAcceleratedOverflowScroll,
     ::switches::kDisableAcceleratedVideoDecode,
     ::switches::kDisableDelegatedRenderer,
     ::switches::kDisableDistanceFieldText,
@@ -83,19 +82,20 @@ std::string DeriveCommandLine(const GURL& start_url,
     ::switches::kDisableImplSidePainting,
     ::switches::kDisableLowResTiling,
     ::switches::kDisableMediaSource,
+    ::switches::kDisablePreferCompositingToLCDText,
     ::switches::kDisablePrefixedEncryptedMedia,
     ::switches::kDisablePanelFitting,
     ::switches::kDisableSeccompFilterSandbox,
     ::switches::kDisableSetuidSandbox,
+    ::switches::kDisableThreadedScrolling,
     ::switches::kDisableTouchDragDrop,
     ::switches::kDisableTouchEditing,
-    ::switches::kDisableAcceleratedFixedRootBackground,
     ::switches::kDisableZeroCopy,
-    ::switches::kEnableAcceleratedFixedRootBackground,
-    ::switches::kEnableAcceleratedOverflowScroll,
+    ::switches::kEnableAcceleratedJpegDecoding,
     ::switches::kEnableBeginFrameScheduling,
-    ::switches::kEnableCompositingForFixedPosition,
+    ::switches::kEnablePreferCompositingToLCDText,
     ::switches::kEnableDelegatedRenderer,
+    ::switches::kDisableDisplayList2dCanvas,
     ::switches::kEnableDisplayList2dCanvas,
     ::switches::kEnableEncryptedMedia,
     ::switches::kDisableGpuSandbox,
@@ -158,6 +158,7 @@ std::string DeriveCommandLine(const GURL& start_url,
     ::switches::kDisableVaapiAcceleratedVideoEncode,
 #if defined(USE_OZONE)
     ::switches::kOzonePlatform,
+    ::switches::kOzoneUseSurfaceless,
 #endif
     app_list::switches::kDisableSyncAppList,
     app_list::switches::kEnableSyncAppList,