diff options
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 |