OLD | NEW |
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 3830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3841 EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false, 0))
; | 3841 EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false, 0))
; |
3842 | 3842 |
3843 mainFrame->resetMatchCount(); | 3843 mainFrame->resetMatchCount(); |
3844 mainFrame->scopeStringMatches(kFindIdentifier, searchText, options, true); | 3844 mainFrame->scopeStringMatches(kFindIdentifier, searchText, options, true); |
3845 | 3845 |
3846 runPendingTasks(); | 3846 runPendingTasks(); |
3847 EXPECT_TRUE(client.findResultsAreReady()); | 3847 EXPECT_TRUE(client.findResultsAreReady()); |
3848 | 3848 |
3849 // Get the tickmarks for the original find request. | 3849 // Get the tickmarks for the original find request. |
3850 FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameVi
ew(); | 3850 FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameVi
ew(); |
3851 RefPtr<Scrollbar> scrollbar = frameView->createScrollbar(HorizontalScrollbar
); | 3851 RefPtrWillBeRawPtr<Scrollbar> scrollbar = frameView->createScrollbar(Horizon
talScrollbar); |
3852 Vector<IntRect> originalTickmarks; | 3852 Vector<IntRect> originalTickmarks; |
3853 scrollbar->getTickmarks(originalTickmarks); | 3853 scrollbar->getTickmarks(originalTickmarks); |
3854 EXPECT_EQ(4u, originalTickmarks.size()); | 3854 EXPECT_EQ(4u, originalTickmarks.size()); |
3855 | 3855 |
3856 // Override the tickmarks. | 3856 // Override the tickmarks. |
3857 Vector<IntRect> overridingTickmarksExpected; | 3857 Vector<IntRect> overridingTickmarksExpected; |
3858 overridingTickmarksExpected.append(IntRect(0, 0, 100, 100)); | 3858 overridingTickmarksExpected.append(IntRect(0, 0, 100, 100)); |
3859 overridingTickmarksExpected.append(IntRect(0, 20, 100, 100)); | 3859 overridingTickmarksExpected.append(IntRect(0, 20, 100, 100)); |
3860 overridingTickmarksExpected.append(IntRect(0, 30, 100, 100)); | 3860 overridingTickmarksExpected.append(IntRect(0, 30, 100, 100)); |
3861 mainFrame->setTickmarks(overridingTickmarksExpected); | 3861 mainFrame->setTickmarks(overridingTickmarksExpected); |
(...skipping 2860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6722 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); | 6722 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); |
6723 | 6723 |
6724 // Neither should a page reload. | 6724 // Neither should a page reload. |
6725 localFrame->reload(); | 6725 localFrame->reload(); |
6726 EXPECT_EQ(4u, frameClient.provisionalLoadCount()); | 6726 EXPECT_EQ(4u, frameClient.provisionalLoadCount()); |
6727 EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition()); | 6727 EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition()); |
6728 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); | 6728 EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount()); |
6729 } | 6729 } |
6730 | 6730 |
6731 } // namespace | 6731 } // namespace |
OLD | NEW |