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

Side by Side Diff: content/shell/renderer/test_runner/WebFrameTestProxy.h

Issue 220553002: Revert of Introduce an intra-priority level sorting value - Chromium Side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « content/common/resource_messages.h ('k') | content/shell/renderer/test_runner/WebTestProxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/WebTestProxy.h" 9 #include "content/shell/renderer/test_runner/WebTestProxy.h"
10 #include "third_party/WebKit/public/platform/WebString.h" 10 #include "third_party/WebKit/public/platform/WebString.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, bl ink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) 128 virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, bl ink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse)
129 { 129 {
130 m_baseProxy->willSendRequest(frame, identifier, request, redirectRespons e); 130 m_baseProxy->willSendRequest(frame, identifier, request, redirectRespons e);
131 Base::willSendRequest(frame, identifier, request, redirectResponse); 131 Base::willSendRequest(frame, identifier, request, redirectResponse);
132 } 132 }
133 virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, const blink::WebURLResponse& response) 133 virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, const blink::WebURLResponse& response)
134 { 134 {
135 m_baseProxy->didReceiveResponse(frame, identifier, response); 135 m_baseProxy->didReceiveResponse(frame, identifier, response);
136 Base::didReceiveResponse(frame, identifier, response); 136 Base::didReceiveResponse(frame, identifier, response);
137 } 137 }
138 virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned iden tifier, const blink::WebURLRequest::Priority& priority, int intra_priority_value ) 138 virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned iden tifier, const blink::WebURLRequest::Priority& priority)
139 { 139 {
140 // This is not implemented in RenderFrameImpl, so need to explicitly cal l 140 // This is not implemented in RenderFrameImpl, so need to explicitly cal l
141 // into the base proxy. 141 // into the base proxy.
142 m_baseProxy->didChangeResourcePriority(frame, identifier, priority, intr a_priority_value); 142 m_baseProxy->didChangeResourcePriority(frame, identifier, priority);
143 Base::didChangeResourcePriority(frame, identifier, priority, intra_prior ity_value); 143 Base::didChangeResourcePriority(frame, identifier, priority);
144 } 144 }
145 virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifi er) 145 virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifi er)
146 { 146 {
147 Base::didFinishResourceLoad(frame, identifier); 147 Base::didFinishResourceLoad(frame, identifier);
148 } 148 }
149 virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame * frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest& request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolic y, bool isRedirect) 149 virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame * frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest& request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolic y, bool isRedirect)
150 { 150 {
151 blink::WebNavigationPolicy policy = m_baseProxy->decidePolicyForNavigati on(frame, extraData, request, type, defaultPolicy, isRedirect); 151 blink::WebNavigationPolicy policy = m_baseProxy->decidePolicyForNavigati on(frame, extraData, request, type, defaultPolicy, isRedirect);
152 if (policy == blink::WebNavigationPolicyIgnore) 152 if (policy == blink::WebNavigationPolicyIgnore)
153 return policy; 153 return policy;
(...skipping 19 matching lines...) Expand all
173 // It is used instead of a #define and is set by layouttest_support when 173 // It is used instead of a #define and is set by layouttest_support when
174 // creating this object. 174 // creating this object.
175 int m_version; 175 int m_version;
176 176
177 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 177 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
178 }; 178 };
179 179
180 } 180 }
181 181
182 #endif // WebTestProxy_h 182 #endif // WebTestProxy_h
OLDNEW
« no previous file with comments | « content/common/resource_messages.h ('k') | content/shell/renderer/test_runner/WebTestProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698