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

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: Fix popup unit tests 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 3795 matching lines...) Expand 10 before | Expand all | Expand 10 after
3806 EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false, 0)) ; 3806 EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false, 0)) ;
3807 3807
3808 mainFrame->resetMatchCount(); 3808 mainFrame->resetMatchCount();
3809 mainFrame->scopeStringMatches(kFindIdentifier, searchText, options, true); 3809 mainFrame->scopeStringMatches(kFindIdentifier, searchText, options, true);
3810 3810
3811 runPendingTasks(); 3811 runPendingTasks();
3812 EXPECT_TRUE(client.findResultsAreReady()); 3812 EXPECT_TRUE(client.findResultsAreReady());
3813 3813
3814 // Get the tickmarks for the original find request. 3814 // Get the tickmarks for the original find request.
3815 FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameVi ew(); 3815 FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameVi ew();
3816 RefPtr<Scrollbar> scrollbar = frameView->createScrollbar(HorizontalScrollbar ); 3816 RefPtrWillBeRawPtr<Scrollbar> scrollbar = frameView->createScrollbar(Horizon talScrollbar);
3817 Vector<IntRect> originalTickmarks; 3817 Vector<IntRect> originalTickmarks;
3818 scrollbar->getTickmarks(originalTickmarks); 3818 scrollbar->getTickmarks(originalTickmarks);
3819 EXPECT_EQ(4u, originalTickmarks.size()); 3819 EXPECT_EQ(4u, originalTickmarks.size());
3820 3820
3821 // Override the tickmarks. 3821 // Override the tickmarks.
3822 Vector<IntRect> overridingTickmarksExpected; 3822 Vector<IntRect> overridingTickmarksExpected;
3823 overridingTickmarksExpected.append(IntRect(0, 0, 100, 100)); 3823 overridingTickmarksExpected.append(IntRect(0, 0, 100, 100));
3824 overridingTickmarksExpected.append(IntRect(0, 20, 100, 100)); 3824 overridingTickmarksExpected.append(IntRect(0, 20, 100, 100));
3825 overridingTickmarksExpected.append(IntRect(0, 30, 100, 100)); 3825 overridingTickmarksExpected.append(IntRect(0, 30, 100, 100));
3826 mainFrame->setTickmarks(overridingTickmarksExpected); 3826 mainFrame->setTickmarks(overridingTickmarksExpected);
(...skipping 2802 matching lines...) Expand 10 before | Expand all | Expand 10 after
6629 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); 6629 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
6630 6630
6631 // Neither should a page reload. 6631 // Neither should a page reload.
6632 localFrame->reload(); 6632 localFrame->reload();
6633 EXPECT_EQ(4u, frameClient.provisionalLoadCount()); 6633 EXPECT_EQ(4u, frameClient.provisionalLoadCount());
6634 EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition()); 6634 EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition());
6635 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); 6635 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
6636 } 6636 }
6637 6637
6638 } // namespace 6638 } // namespace
OLDNEW
« Source/core/frame/FrameViewAutoSizeInfo.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