diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:14:02 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:14:02 +0000 |
| commit | efc9bd87274e3647537fc22f93f49022edde4e71 (patch) | |
| tree | 5d725950c268a62a46957d503f92acfd287d6c40 /webkit/glue/glue_serialize.cc | |
| parent | 52efff2f9251cf276eb5453a2a6be79b1669207a (diff) | |
| download | chromium_src-efc9bd87274e3647537fc22f93f49022edde4e71.zip chromium_src-efc9bd87274e3647537fc22f93f49022edde4e71.tar.gz chromium_src-efc9bd87274e3647537fc22f93f49022edde4e71.tar.bz2 | |
Remove preprocess hack now that WebKit has been updated.
R=sky
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2832021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/glue_serialize.cc')
| -rw-r--r-- | webkit/glue/glue_serialize.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc index 6ff22a9..caf37b45 100644 --- a/webkit/glue/glue_serialize.cc +++ b/webkit/glue/glue_serialize.cc @@ -61,11 +61,7 @@ struct SerializeObject { // NOTE: If the version is -1, then the pickle contains only a URL string. // See CreateHistoryStateForURL. // -#if defined(WEBKIT_BUG_40451_IS_FIXED) int kVersion = 9; -#else -int kVersion = 8; -#endif // A bunch of convenience functions to read/write to SerializeObjects. // The serializers assume the input data is in the correct format and so does @@ -311,10 +307,8 @@ static void WriteHistoryItem( WriteStringVector(item.documentState(), obj); -#if defined(WEBKIT_BUG_40451_IS_FIXED) if (kVersion >= 9) WriteInteger64(item.itemSequenceNumber(), obj); -#endif if (kVersion >= 6) WriteInteger64(item.documentSequenceNumber(), obj); if (kVersion >= 7) { @@ -374,10 +368,8 @@ static WebHistoryItem ReadHistoryItem( item.setDocumentState(ReadStringVector(obj)); -#if defined(WEBKIT_BUG_40451_IS_FIXED) if (obj->version >= 9) item.setItemSequenceNumber(ReadInteger64(obj)); -#endif if (obj->version >= 6) item.setDocumentSequenceNumber(ReadInteger64(obj)); if (obj->version >= 7) { |