diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 02:17:18 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 02:17:18 +0000 |
| commit | 0383fcc8f8db16d84d1d9215a769e663d56bd9ed (patch) | |
| tree | ffe0aa51f19fd7f30033a0a9582ea549421cd6e2 /webkit | |
| parent | deb96b4e3e585f2ded7bad339775569b7ca41213 (diff) | |
| download | chromium_src-0383fcc8f8db16d84d1d9215a769e663d56bd9ed.zip chromium_src-0383fcc8f8db16d84d1d9215a769e663d56bd9ed.tar.gz chromium_src-0383fcc8f8db16d84d1d9215a769e663d56bd9ed.tar.bz2 | |
Revert 138415 - Makes the browser send pixels to the GPU process where it should.
This patch fixes the places where we will be sending DIP to the GPU process but should be sending pixels instead to the GPU process once https://bugs.webkit.org/show_bug.cgi?id=86051 lands.
This patch reverts:
http://codereview.chromium.org/127553/
http://codereview.chromium.org/10332077/
Bug=127455, 114677
Test=Manual
SchedulePaintInRect is called with parameters in DIP
TBR=piman@chromium.org,sky@chromium.org,jamesr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10411086
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10383297
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 8fa2a6d..6c20aa4 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -38,7 +38,6 @@ WebPreferences::WebPreferences() minimum_logical_font_size(6), default_device_scale_factor(1), default_encoding("ISO-8859-1"), - apply_default_device_scale_factor_in_compositor(false), javascript_enabled(true), web_security_enabled(true), javascript_can_open_windows_automatically(true), @@ -199,8 +198,6 @@ void WebPreferences::Apply(WebView* web_view) const { settings->setMinimumLogicalFontSize(minimum_logical_font_size); settings->setDefaultDeviceScaleFactor(default_device_scale_factor); settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding)); - settings->setApplyDefaultDeviceScaleFactorInCompositor( - apply_default_device_scale_factor_in_compositor); settings->setJavaScriptEnabled(javascript_enabled); settings->setWebSecurityEnabled(web_security_enabled); settings->setJavaScriptCanOpenWindowsAutomatically( diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index a45ddaf..0a8a38b 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -47,7 +47,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { int minimum_logical_font_size; int default_device_scale_factor; std::string default_encoding; - bool apply_default_device_scale_factor_in_compositor; bool javascript_enabled; bool web_security_enabled; bool javascript_can_open_windows_automatically; |