Skip to content

Commit

Permalink
Revert V8 roll due to failure of WebNavigationIFrame
Browse files Browse the repository at this point in the history
Review URL: http://codereview.chromium.org/7121011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88123 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
erik.corry@gmail.com committed Jun 7, 2011
1 parent aa5ed33 commit bef1293
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ vars = {
"libvpx_revision": "81610",
"ffmpeg_revision": "83815",
"skia_revision": "1517",
"v8_revision": "8178",
"v8_revision": "8107",
}

deps = {
Expand Down
10 changes: 1 addition & 9 deletions chrome/browser/prerender/prerender_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ class TestPrerenderContents : public PrerenderContents {
}

virtual ~TestPrerenderContents() {
EXPECT_EQ(FinalStatusCanonicalize(expected_final_status_),
FinalStatusCanonicalize(final_status())) <<
EXPECT_EQ(expected_final_status_, final_status()) <<
" when testing URL " << prerender_url().path();
// Prerendering RenderViewHosts should be hidden before the first
// navigation, so this should be happen for every PrerenderContents for
Expand Down Expand Up @@ -178,13 +177,6 @@ class TestPrerenderContents : public PrerenderContents {
PrerenderContents::Observe(type, source, details);
}

static FinalStatus FinalStatusCanonicalize(FinalStatus final) {
if (final == FINAL_STATUS_JS_OUT_OF_MEMORY) {
return FINAL_STATUS_MEMORY_LIMIT_EXCEEDED;
}
return final;
}

int number_of_loads_;
int expected_number_of_loads_;
FinalStatus expected_final_status_;
Expand Down
5 changes: 0 additions & 5 deletions webkit/tools/layout_tests/test_expectations.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,3 @@ BUGGMAN : fast/canvas/canvas-transform-skewed.html = IMAGE
BUGGMAN : fast/canvas/zero-size-fill-rect.html = IMAGE
BUGGMAN : media/video-canvas-alpha.html = IMAGE

// We now follow the ES5 spec with regards to the semantics of the receiver
// given through eval to builtins (undefined). Test assumes that the global
// object is given as receiver.
BUGRICOW : fast/js/eval-var-decl.html = TEXT

0 comments on commit bef1293

Please sign in to comment.