Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Side by Side Diff: Source/web/tests/WebFrameTest.cpp

Issue 603193005: Move the Widget hierarchy to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase upto and resolve r182737 conflict. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 3470 matching lines...) Expand 10 before | Expand all | Expand 10 after
3481 EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false, 0)) ; 3481 EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false, 0)) ;
3482 3482
3483 mainFrame->resetMatchCount(); 3483 mainFrame->resetMatchCount();
3484 mainFrame->scopeStringMatches(kFindIdentifier, searchText, options, true); 3484 mainFrame->scopeStringMatches(kFindIdentifier, searchText, options, true);
3485 3485
3486 runPendingTasks(); 3486 runPendingTasks();
3487 EXPECT_TRUE(client.findResultsAreReady()); 3487 EXPECT_TRUE(client.findResultsAreReady());
3488 3488
3489 // Get the tickmarks for the original find request. 3489 // Get the tickmarks for the original find request.
3490 FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameVi ew(); 3490 FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameVi ew();
3491 RefPtr<Scrollbar> scrollbar = frameView->createScrollbar(HorizontalScrollbar ); 3491 RefPtrWillBeRawPtr<Scrollbar> scrollbar = frameView->createScrollbar(Horizon talScrollbar);
3492 Vector<IntRect> originalTickmarks; 3492 Vector<IntRect> originalTickmarks;
3493 scrollbar->getTickmarks(originalTickmarks); 3493 scrollbar->getTickmarks(originalTickmarks);
3494 EXPECT_EQ(4u, originalTickmarks.size()); 3494 EXPECT_EQ(4u, originalTickmarks.size());
3495 3495
3496 // Override the tickmarks. 3496 // Override the tickmarks.
3497 Vector<IntRect> overridingTickmarksExpected; 3497 Vector<IntRect> overridingTickmarksExpected;
3498 overridingTickmarksExpected.append(IntRect(0, 0, 100, 100)); 3498 overridingTickmarksExpected.append(IntRect(0, 0, 100, 100));
3499 overridingTickmarksExpected.append(IntRect(0, 20, 100, 100)); 3499 overridingTickmarksExpected.append(IntRect(0, 20, 100, 100));
3500 overridingTickmarksExpected.append(IntRect(0, 30, 100, 100)); 3500 overridingTickmarksExpected.append(IntRect(0, 30, 100, 100));
3501 mainFrame->setTickmarks(overridingTickmarksExpected); 3501 mainFrame->setTickmarks(overridingTickmarksExpected);
(...skipping 2802 matching lines...) Expand 10 before | Expand all | Expand 10 after
6304 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); 6304 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
6305 6305
6306 // Neither should a page reload. 6306 // Neither should a page reload.
6307 localFrame->reload(); 6307 localFrame->reload();
6308 EXPECT_EQ(4u, frameClient.provisionalLoadCount()); 6308 EXPECT_EQ(4u, frameClient.provisionalLoadCount());
6309 EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition()); 6309 EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition());
6310 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); 6310 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
6311 } 6311 }
6312 6312
6313 } // namespace 6313 } // namespace
OLDNEW
« Source/web/WebPluginContainerImpl.h ('K') | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698