diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 08:28:27 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 08:28:27 +0000 |
commit | 1ecfa63f9c178bd3e49a1280cf31b318c7187df1 (patch) | |
tree | b67606a1d8f05214ed94b90a455f6ad8c0ea037f /webkit | |
parent | 9fefa4ec58c2ea55cc0202f610b0d871a683319a (diff) | |
download | chromium_src-1ecfa63f9c178bd3e49a1280cf31b318c7187df1.zip chromium_src-1ecfa63f9c178bd3e49a1280cf31b318c7187df1.tar.gz chromium_src-1ecfa63f9c178bd3e49a1280cf31b318c7187df1.tar.bz2 |
Update webkit to r53957.
This includes changes to WebKit that make history.{back,forward,go}
behave synchronously when navigating back to a reference fragment.
That is something we still implement asynchronously. As a result,
we now fail the location-hash.html test.
Includes changes to glue_serialize.cc to support serializing the
WebHistoryItem's documentSequenceNumber. (+sky for review on this
part.)
TBR=pfeldman,sky
Review URL: http://codereview.chromium.org/556055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/glue_serialize.cc | 10 | ||||
-rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 15 |
2 files changed, 21 insertions, 4 deletions
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc index 6cbe39b..d16a0bc 100644 --- a/webkit/glue/glue_serialize.cc +++ b/webkit/glue/glue_serialize.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -49,8 +49,9 @@ struct SerializeObject { // This version checks and reads v1 and v2 correctly. // 4: Adds support for storing FormData::identifier(). // 5: Adds support for empty FormData +// 6: Adds support for documentSequenceNumbers // Should be const, but unit tests may modify it. -int kVersion = 5; +int kVersion = 6; // A bunch of convenience functions to read/write to SerializeObjects. // The serializers assume the input data is in the correct format and so does @@ -273,6 +274,8 @@ static void WriteHistoryItem( WriteStringVector(item.documentState(), obj); + WriteInteger64(item.documentSequenceNumber(), obj); + // Yes, the referrer is written twice. This is for backwards // compatibility with the format. WriteFormData(item.httpBody(), obj); @@ -315,6 +318,9 @@ static WebHistoryItem ReadHistoryItem( item.setDocumentState(ReadStringVector(obj)); + if (obj->version >= 6) + item.setDocumentSequenceNumber(ReadInteger64(obj)); + // The extra referrer string is read for backwards compat. const WebHTTPBody& http_body = ReadFormData(obj); const WebString& http_content_type = ReadString(obj); diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index efe35ec..34571f6 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2108,7 +2108,6 @@ BUG9786 : http/tests/security/cross-frame-access-document-direct.html = TIMEOUT BUG10479 MAC : svg/hixie/perf/001.xml = FAIL BUG10479 MAC : svg/hixie/perf/002.xml = FAIL -BUG9798 SLOW WIN DEBUG : fast/dom/Window/slow_unload_handler.html = PASS BUG9798 LINUX DEBUG SLOW : fast/frames/calculate-round.html = CRASH PASS // Was flaky. Became a consistent failure. @@ -2734,7 +2733,7 @@ BUG30048 : svg/css/composite-shadow-with-opacity.html = IMAGE BUG30049 : platform/win/editing/selection/doubleclick-should-not-expand-across-lines.html = TEXT MISSING // Flaky. -BUG30180 : fast/text/international/hindi-whitespace.html = IMAGE PASS +BUG30180 : fast/text/international/hindi-whitespace.html = IMAGE+TEXT PASS // evan's fix rolled out in http://trac.webkit.org/changeset/52071 due to compat issues. BUG30343 LINUX : fast/css/large-number-round-trip.html = TEXT @@ -2911,7 +2910,19 @@ BUG33099 : media/video-timeupdate-reverse-play.html = TIMEOUT BUG33288 : fast/forms/input-valueasnumber-date.html = TEXT BUG33288 : fast/forms/input-valueasnumber-datetime.html = TEXT BUG33288 : fast/forms/input-valueasnumber-month.html = TEXT +// Newly added tests from r53964 +BUG33288 : fast/forms/input-valueasnumber-datetimelocal.html = TEXT // Flaky storage tests BUG33343 LINUX MAC : storage/database-lock-after-reload.html = CRASH TEXT PASS BUG33343 DEBUG : storage/multiple-databases-garbage-collection.html = CRASH PASS + +// Disabled until we get history.{back,forward,go} changed to always be +// asynchronously again. +BUG33350 : fast/dom/location-hash.html = TEXT + +// WebKit roll 53941 -> 53974 +BUG33359 WIN LINUX : fast/css/button-height.html = TEXT +BUG33358 : fast/dom/Window/window-postmessage-clone-frames.html = TEXT +BUG33357 : fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html = TEXT +BUG33357 : fast/dom/Window/slow-unload-handler.html = TEXT |