Commit a429d3a9 authored by danakj@chromium.org's avatar danakj@chromium.org

Remove the kDisableBrowserPluginCompositing flag.

We are always in compositing mode now, so this flag is not valid and
we are deleting the code paths it would trigger.

R=fsamuel@chromium.org, piman@chromium.org
BUG=362164

Review URL: https://codereview.chromium.org/233393007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263080 0039d316-1c4b-4281-b951-d872f2087c98
parent 2c4d4cd8
...@@ -71,7 +71,6 @@ std::string DeriveCommandLine(const GURL& start_url, ...@@ -71,7 +71,6 @@ std::string DeriveCommandLine(const GURL& start_url,
::switches::kDisableAccelerated2dCanvas, ::switches::kDisableAccelerated2dCanvas,
::switches::kDisableAcceleratedOverflowScroll, ::switches::kDisableAcceleratedOverflowScroll,
::switches::kDisableAcceleratedVideoDecode, ::switches::kDisableAcceleratedVideoDecode,
::switches::kDisableBrowserPluginCompositing,
::switches::kDisableDelegatedRenderer, ::switches::kDisableDelegatedRenderer,
::switches::kDisableFastTextAutosizing, ::switches::kDisableFastTextAutosizing,
::switches::kDisableFiltersOverIPC, ::switches::kDisableFiltersOverIPC,
......
...@@ -69,9 +69,7 @@ GpuMessageFilter::GpuMessageFilter(int render_process_id, ...@@ -69,9 +69,7 @@ GpuMessageFilter::GpuMessageFilter(int render_process_id,
#else #else
// Share contexts when compositing webview plugin or using share groups // Share contexts when compositing webview plugin or using share groups
// for asynchronous texture uploads. // for asynchronous texture uploads.
if (!CommandLine::ForCurrentProcess()->HasSwitch( if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableBrowserPluginCompositing) ||
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableShareGroupAsyncTextureUpload)) switches::kEnableShareGroupAsyncTextureUpload))
share_contexts_ = true; share_contexts_ = true;
#endif #endif
......
...@@ -513,16 +513,6 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) { ...@@ -513,16 +513,6 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
switches::kEnableSpatialNavigation); switches::kEnableSpatialNavigation);
GetContentClient()->browser()->OverrideWebkitPrefs(this, url, &prefs); GetContentClient()->browser()->OverrideWebkitPrefs(this, url, &prefs);
// Disable compositing in guests until we have compositing path implemented
// for guests.
bool guest_compositing_enabled = !command_line.HasSwitch(
switches::kDisableBrowserPluginCompositing);
if (GetProcess()->IsGuest() && !guest_compositing_enabled) {
prefs.force_compositing_mode = false;
prefs.accelerated_compositing_enabled = false;
}
return prefs; return prefs;
} }
......
...@@ -119,10 +119,6 @@ const char kDisableApplicationCache[] = "disable-application-cache"; ...@@ -119,10 +119,6 @@ const char kDisableApplicationCache[] = "disable-application-cache";
// users with many windows/tabs and lots of memory. // users with many windows/tabs and lots of memory.
const char kDisableBackingStoreLimit[] = "disable-backing-store-limit"; const char kDisableBackingStoreLimit[] = "disable-backing-store-limit";
// Disable browser plugin compositing experiment.
const char kDisableBrowserPluginCompositing[] =
"disable-browser-plugin-compositing";
// See comment for kEnableCompositingForFixedPosition. // See comment for kEnableCompositingForFixedPosition.
const char kDisableCompositingForFixedPosition[] = const char kDisableCompositingForFixedPosition[] =
"disable-fixed-position-compositing"; "disable-fixed-position-compositing";
......
...@@ -44,7 +44,6 @@ CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[]; ...@@ -44,7 +44,6 @@ CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
CONTENT_EXPORT extern const char kDisableAltWinstation[]; CONTENT_EXPORT extern const char kDisableAltWinstation[];
CONTENT_EXPORT extern const char kDisableApplicationCache[]; CONTENT_EXPORT extern const char kDisableApplicationCache[];
extern const char kDisableBackingStoreLimit[]; extern const char kDisableBackingStoreLimit[];
CONTENT_EXPORT extern const char kDisableBrowserPluginCompositing[];
CONTENT_EXPORT extern const char kDisableCompositingForFixedPosition[]; CONTENT_EXPORT extern const char kDisableCompositingForFixedPosition[];
CONTENT_EXPORT extern const char kDisableCompositingForTransition[]; CONTENT_EXPORT extern const char kDisableCompositingForTransition[];
CONTENT_EXPORT extern const char kDisableDatabases[]; CONTENT_EXPORT extern const char kDisableDatabases[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment