diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 00:19:20 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 00:19:20 +0000 |
| commit | fca530c8e220565d207d2fe624688eaf9f34aba9 (patch) | |
| tree | 3e8cff52eb5a02bc506d1cf781ffd805c4516f58 /webkit/glue | |
| parent | c497130c26edb82fed161ab564cc5fdb5a80993b (diff) | |
| download | chromium_src-fca530c8e220565d207d2fe624688eaf9f34aba9.zip chromium_src-fca530c8e220565d207d2fe624688eaf9f34aba9.tar.gz chromium_src-fca530c8e220565d207d2fe624688eaf9f34aba9.tar.bz2 | |
Revert 184502
Please don't use NOTRY=true with code changes.
Caused problems on the Android bots.
[ RUN ] GlueSerializeTest.BackwardsCompatibleTest
../../webkit/glue/glue_serialize_unittest.cc:118: Failure
Value of: b.scrollOffset()
Actual: 21,-21
Expected: a.scrollOffset()
Which is: 42,-42
../../webkit/glue/glue_serialize_unittest.cc:123: Failure
Value of: b.pageScaleFactor()
Actual: 1
Expected: a.pageScaleFactor()
Which is: 2
[ FAILED ] GlueSerializeTest.BackwardsCompatibleTest (2 ms)
> Backwards compatibility with HistoryItems with old page scale.
>
> Given the semantic change in page scale, users upgrading from M18 would
> find their existing tabs all zoomed in at a weird scroll offset. Add
> some more backwards compatibility cruft to compensate.
>
> NOTRY=true
> BUG=175807
>
>
> Review URL: https://chromiumcodereview.appspot.com/12297020
TBR=aelias@chromium.org
Review URL: https://codereview.chromium.org/12328096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/glue_serialize.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc index cfe9330..e9d3ae4 100644 --- a/webkit/glue/glue_serialize.cc +++ b/webkit/glue/glue_serialize.cc @@ -17,7 +17,6 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" -#include "ui/gfx/screen.h" #include "webkit/base/file_path_string_conversions.h" using WebKit::WebData; @@ -457,23 +456,11 @@ WebHistoryItem ReadHistoryItem( } #if defined(OS_ANDROID) + // Now-unused values that shipped in this version of Chrome for Android when + // it was on a private branch. if (obj->version == 11) { - // Now-unused values that shipped in this version of Chrome for Android when - // it was on a private branch. ReadReal(obj); ReadBoolean(obj); - - // In this version, pageScaleFactor included deviceScaleFactor and scroll - // offsets were premultiplied by pageScaleFactor. - if (item.pageScaleFactor()) { - if (include_scroll_offset) - item.setScrollOffset( - WebPoint(item.scrollOffset().x / item.pageScaleFactor(), - item.scrollOffset().y / item.pageScaleFactor())); - item.setPageScaleFactor(item.pageScaleFactor() / - gfx::Screen::GetNativeScreen()->GetPrimaryDisplay() - .device_scale_factor()); - } } #endif |