| Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| index 912a0fd56e72d73e65100a382b85e85963eea718..44b438e783ee7d5196d27057288f8c1eb92913df 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -5887,7 +5887,7 @@ public:
|
| int willSendRequestCallCount() const { return m_willSendRequestCallCount; }
|
| int childFrameCreationCount() const { return m_childFrameCreationCount; }
|
|
|
| - virtual WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, WebSandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
|
| + WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, WebSandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) override
|
| {
|
| ASSERT(m_childClient);
|
| m_childFrameCreationCount++;
|
| @@ -5896,7 +5896,7 @@ public:
|
| return frame;
|
| }
|
|
|
| - virtual void didStartLoading(bool toDifferentDocument)
|
| + void didStartLoading(bool toDifferentDocument) override
|
| {
|
| if (m_parentClient) {
|
| m_parentClient->didStartLoading(toDifferentDocument);
|
| @@ -5905,13 +5905,13 @@ public:
|
| TestWebFrameClient::didStartLoading(toDifferentDocument);
|
| }
|
|
|
| - virtual void didStopLoading()
|
| + void didStopLoading(WebLocalFrame* frame) override
|
| {
|
| if (m_parentClient) {
|
| - m_parentClient->didStopLoading();
|
| + m_parentClient->didStopLoading(frame);
|
| return;
|
| }
|
| - TestWebFrameClient::didStopLoading();
|
| + TestWebFrameClient::didStopLoading(frame);
|
| }
|
|
|
| void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&) override
|
| @@ -5965,7 +5965,7 @@ public:
|
| {
|
| }
|
|
|
| - virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&)
|
| + void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&) override
|
| {
|
| if (toWebLocalFrameImpl(frame)->frame()->loader().loadType() == FrameLoadTypeSame)
|
| m_frameLoadTypeSameSeen = true;
|
| @@ -5999,7 +5999,7 @@ public:
|
| {
|
| }
|
|
|
| - virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&)
|
| + void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&) override
|
| {
|
| if (request.requestContext() == WebURLRequest::RequestContextImage) {
|
| m_numOfImageRequests++;
|
| @@ -6070,9 +6070,9 @@ public:
|
| m_differentDocumentStartCount++;
|
| }
|
|
|
| - void didStopLoading() override
|
| + void didStopLoading(WebLocalFrame* frame) override
|
| {
|
| - TestWebFrameClient::didStopLoading();
|
| + TestWebFrameClient::didStopLoading(frame);
|
| m_stopLoadingCount++;
|
| }
|
|
|
| @@ -6889,7 +6889,7 @@ public:
|
| }
|
|
|
| private:
|
| - virtual void didChangeThemeColor()
|
| + void didChangeThemeColor() override
|
| {
|
| m_didNotify = true;
|
| }
|
| @@ -7777,7 +7777,7 @@ TEST_P(ParameterizedWebFrameTest, DetachRemoteFrame)
|
|
|
| class TestConsoleMessageWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
|
| public:
|
| - virtual void didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine, const WebString& stackTrace)
|
| + void didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine, const WebString& stackTrace) override
|
| {
|
| messages.append(message);
|
| }
|
| @@ -8326,10 +8326,10 @@ public:
|
| void didFinishDocumentLoad(WebLocalFrame*, bool documentIsEmpty) override { EXPECT_EQ(3, m_callbackCount++); }
|
| void didHandleOnloadEvents(WebLocalFrame*) override { EXPECT_EQ(4, m_callbackCount++); }
|
| void didFinishLoad(WebLocalFrame*) override { EXPECT_EQ(5, m_callbackCount++); }
|
| - void didStopLoading() override
|
| + void didStopLoading(WebLocalFrame* frame) override
|
| {
|
| EXPECT_EQ(6, m_callbackCount++);
|
| - FrameTestHelpers::TestWebFrameClient::didStopLoading();
|
| + FrameTestHelpers::TestWebFrameClient::didStopLoading(frame);
|
| }
|
|
|
| private:
|
|
|