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

Side by Side Diff: content/shell/renderer/test_runner/web_test_proxy.cc

Issue 918313003: Reset drag_image_ in web_test_proxy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/shell/renderer/test_runner/web_test_proxy.h" 5 #include "content/shell/renderer/test_runner/web_test_proxy.h"
6 6
7 #include <cctype> 7 #include <cctype>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 } 368 }
369 369
370 blink::WebView* WebTestProxyBase::GetWebView() const { 370 blink::WebView* WebTestProxyBase::GetWebView() const {
371 DCHECK(web_widget_); 371 DCHECK(web_widget_);
372 // TestRunner does not support popup widgets. So |web_widget|_ is always a 372 // TestRunner does not support popup widgets. So |web_widget|_ is always a
373 // WebView. 373 // WebView.
374 return static_cast<blink::WebView*>(web_widget_); 374 return static_cast<blink::WebView*>(web_widget_);
375 } 375 }
376 376
377 void WebTestProxyBase::Reset() { 377 void WebTestProxyBase::Reset() {
378 drag_image_.reset();
378 animate_scheduled_ = false; 379 animate_scheduled_ = false;
379 resource_identifier_map_.clear(); 380 resource_identifier_map_.clear();
380 log_console_output_ = true; 381 log_console_output_ = true;
381 if (midi_client_.get()) 382 if (midi_client_.get())
382 midi_client_->resetMock(); 383 midi_client_->resetMock();
383 accept_languages_ = ""; 384 accept_languages_ = "";
384 } 385 }
385 386
386 blink::WebSpellCheckClient* WebTestProxyBase::GetSpellCheckClient() const { 387 blink::WebSpellCheckClient* WebTestProxyBase::GetSpellCheckClient() const {
387 return spellcheck_.get(); 388 return spellcheck_.get();
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 // to cancel the input method's ongoing composition session. 1323 // to cancel the input method's ongoing composition session.
1323 if (web_widget_) 1324 if (web_widget_)
1324 web_widget_->confirmComposition(); 1325 web_widget_->confirmComposition();
1325 } 1326 }
1326 1327
1327 blink::WebString WebTestProxyBase::acceptLanguages() { 1328 blink::WebString WebTestProxyBase::acceptLanguages() {
1328 return blink::WebString::fromUTF8(accept_languages_); 1329 return blink::WebString::fromUTF8(accept_languages_);
1329 } 1330 }
1330 1331
1331 } // namespace content 1332 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698