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

Side by Side Diff: Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp

Issue 18130006: Remove WebTestProxy override of WebFrameClient::createMediaPlayer(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | public/testing/WebTestDelegate.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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 m_testInterfaces->eventSender()->setContextMenuData(contextMenuData); 1052 m_testInterfaces->eventSender()->setContextMenuData(contextMenuData);
1053 } 1053 }
1054 1054
1055 WebUserMediaClient* WebTestProxyBase::userMediaClient() 1055 WebUserMediaClient* WebTestProxyBase::userMediaClient()
1056 { 1056 {
1057 if (!m_userMediaClient.get()) 1057 if (!m_userMediaClient.get())
1058 m_userMediaClient.reset(new WebUserMediaClientMock(m_delegate)); 1058 m_userMediaClient.reset(new WebUserMediaClientMock(m_delegate));
1059 return m_userMediaClient.get(); 1059 return m_userMediaClient.get();
1060 } 1060 }
1061 1061
1062 WebMediaPlayer* WebTestProxyBase::createMediaPlayer(WebFrame* frame, const WebUR L& url, WebMediaPlayerClient* client)
1063 {
1064 return m_delegate->createWebMediaPlayer(frame, url, client);
1065 }
1066
1067 // Simulate a print by going into print mode and then exit straight away. 1062 // Simulate a print by going into print mode and then exit straight away.
1068 void WebTestProxyBase::printPage(WebFrame* frame) 1063 void WebTestProxyBase::printPage(WebFrame* frame)
1069 { 1064 {
1070 WebSize pageSizeInPixels = webWidget()->size(); 1065 WebSize pageSizeInPixels = webWidget()->size();
1071 WebPrintParams printParams(pageSizeInPixels); 1066 WebPrintParams printParams(pageSizeInPixels);
1072 frame->printBegin(printParams); 1067 frame->printBegin(printParams);
1073 frame->printEnd(); 1068 frame->printEnd();
1074 } 1069 }
1075 1070
1076 WebNotificationPresenter* WebTestProxyBase::notificationPresenter() 1071 WebNotificationPresenter* WebTestProxyBase::notificationPresenter()
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
1553 1548
1554 void WebTestProxyBase::resetInputMethod() 1549 void WebTestProxyBase::resetInputMethod()
1555 { 1550 {
1556 // If a composition text exists, then we need to let the browser process 1551 // If a composition text exists, then we need to let the browser process
1557 // to cancel the input method's ongoing composition session. 1552 // to cancel the input method's ongoing composition session.
1558 if (m_webWidget) 1553 if (m_webWidget)
1559 m_webWidget->confirmComposition(); 1554 m_webWidget->confirmComposition();
1560 } 1555 }
1561 1556
1562 } 1557 }
OLDNEW
« no previous file with comments | « no previous file | public/testing/WebTestDelegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698