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

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

Issue 2782783002: Remove redundant WebLocalFrame* parameter from didFinishDocumentLoad (Closed)
Patch Set: Created 3 years, 8 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 10062 matching lines...) Expand 10 before | Expand all | Expand 10 after
10073 FrameTestHelpers::TestWebFrameClient::didStartLoading(toDifferentDocument); 10073 FrameTestHelpers::TestWebFrameClient::didStartLoading(toDifferentDocument);
10074 } 10074 }
10075 void didStartProvisionalLoad(WebDataSource*, WebURLRequest&) override { 10075 void didStartProvisionalLoad(WebDataSource*, WebURLRequest&) override {
10076 EXPECT_EQ(1, m_callbackCount++); 10076 EXPECT_EQ(1, m_callbackCount++);
10077 } 10077 }
10078 void didCommitProvisionalLoad(WebLocalFrame*, 10078 void didCommitProvisionalLoad(WebLocalFrame*,
10079 const WebHistoryItem&, 10079 const WebHistoryItem&,
10080 WebHistoryCommitType) override { 10080 WebHistoryCommitType) override {
10081 EXPECT_EQ(2, m_callbackCount++); 10081 EXPECT_EQ(2, m_callbackCount++);
10082 } 10082 }
10083 void didFinishDocumentLoad(WebLocalFrame*) override { 10083 void didFinishDocumentLoad() override { EXPECT_EQ(3, m_callbackCount++); }
10084 EXPECT_EQ(3, m_callbackCount++);
10085 }
10086 void didHandleOnloadEvents(WebLocalFrame*) override { 10084 void didHandleOnloadEvents(WebLocalFrame*) override {
10087 EXPECT_EQ(4, m_callbackCount++); 10085 EXPECT_EQ(4, m_callbackCount++);
10088 } 10086 }
10089 void didFinishLoad(WebLocalFrame*) override { 10087 void didFinishLoad(WebLocalFrame*) override {
10090 EXPECT_EQ(5, m_callbackCount++); 10088 EXPECT_EQ(5, m_callbackCount++);
10091 } 10089 }
10092 void didStopLoading() override { 10090 void didStopLoading() override {
10093 EXPECT_EQ(6, m_callbackCount++); 10091 EXPECT_EQ(6, m_callbackCount++);
10094 FrameTestHelpers::TestWebFrameClient::didStopLoading(); 10092 FrameTestHelpers::TestWebFrameClient::didStopLoading();
10095 } 10093 }
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
11261 // TODO(dcheng): Investigate not calling this as well during frame detach. 11259 // TODO(dcheng): Investigate not calling this as well during frame detach.
11262 m_didCallDidStopLoading = true; 11260 m_didCallDidStopLoading = true;
11263 } 11261 }
11264 11262
11265 void didFailProvisionalLoad(WebLocalFrame*, 11263 void didFailProvisionalLoad(WebLocalFrame*,
11266 const WebURLError&, 11264 const WebURLError&,
11267 WebHistoryCommitType) override { 11265 WebHistoryCommitType) override {
11268 EXPECT_TRUE(false) << "The load should not have failed."; 11266 EXPECT_TRUE(false) << "The load should not have failed.";
11269 } 11267 }
11270 11268
11271 void didFinishDocumentLoad(WebLocalFrame*) override { 11269 void didFinishDocumentLoad() override {
11272 // TODO(dcheng): Investigate not calling this as well during frame detach. 11270 // TODO(dcheng): Investigate not calling this as well during frame detach.
11273 m_didCallDidFinishDocumentLoad = true; 11271 m_didCallDidFinishDocumentLoad = true;
11274 } 11272 }
11275 11273
11276 void didHandleOnloadEvents(WebLocalFrame*) override { 11274 void didHandleOnloadEvents(WebLocalFrame*) override {
11277 // TODO(dcheng): Investigate not calling this as well during frame detach. 11275 // TODO(dcheng): Investigate not calling this as well during frame detach.
11278 m_didCallDidHandleOnloadEvents = true; 11276 m_didCallDidHandleOnloadEvents = true;
11279 } 11277 }
11280 11278
11281 void didFinishLoad(WebLocalFrame*) override { 11279 void didFinishLoad(WebLocalFrame*) override {
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
11442 EXPECT_FALSE(testSelectAll("<textarea></textarea>")); 11440 EXPECT_FALSE(testSelectAll("<textarea></textarea>"));
11443 EXPECT_TRUE(testSelectAll("<textarea>nonempty</textarea>")); 11441 EXPECT_TRUE(testSelectAll("<textarea>nonempty</textarea>"));
11444 EXPECT_FALSE(testSelectAll("<input>")); 11442 EXPECT_FALSE(testSelectAll("<input>"));
11445 EXPECT_TRUE(testSelectAll("<input value='nonempty'>")); 11443 EXPECT_TRUE(testSelectAll("<input value='nonempty'>"));
11446 // TODO(amaralp): Empty contenteditable should not have select all enabled. 11444 // TODO(amaralp): Empty contenteditable should not have select all enabled.
11447 EXPECT_TRUE(testSelectAll("<div contenteditable></div>")); 11445 EXPECT_TRUE(testSelectAll("<div contenteditable></div>"));
11448 EXPECT_TRUE(testSelectAll("<div contenteditable>nonempty</div>")); 11446 EXPECT_TRUE(testSelectAll("<div contenteditable>nonempty</div>"));
11449 } 11447 }
11450 11448
11451 } // namespace blink 11449 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp ('k') | third_party/WebKit/public/web/WebFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698