| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011, 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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 ); | 739 ); |
| 740 } | 740 } |
| 741 | 741 |
| 742 // Public functions ----------------------------------------------------------- | 742 // Public functions ----------------------------------------------------------- |
| 743 | 743 |
| 744 WebViewHost::WebViewHost(TestShell* shell) | 744 WebViewHost::WebViewHost(TestShell* shell) |
| 745 : m_shell(shell) | 745 : m_shell(shell) |
| 746 , m_proxy(0) | 746 , m_proxy(0) |
| 747 , m_webWidget(0) | 747 , m_webWidget(0) |
| 748 , m_shutdownWasInvoked(false) | 748 , m_shutdownWasInvoked(false) |
| 749 , m_screenUnavailableBorder(screenUnavailableBorder) |
| 749 { | 750 { |
| 750 reset(); | 751 reset(); |
| 751 } | 752 } |
| 752 | 753 |
| 753 WebViewHost::~WebViewHost() | 754 WebViewHost::~WebViewHost() |
| 754 { | 755 { |
| 755 ASSERT(m_shutdownWasInvoked); | 756 ASSERT(m_shutdownWasInvoked); |
| 756 if (m_inModalLoop) | 757 if (m_inModalLoop) |
| 757 webkit_support::QuitMessageLoop(); | 758 webkit_support::QuitMessageLoop(); |
| 758 } | 759 } |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1003 webView()->willExitFullScreen(); | 1004 webView()->willExitFullScreen(); |
| 1004 webView()->didExitFullScreen(); | 1005 webView()->didExitFullScreen(); |
| 1005 } | 1006 } |
| 1006 | 1007 |
| 1007 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() | 1008 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() |
| 1008 { | 1009 { |
| 1009 if (!m_testMediaStreamClient.get()) | 1010 if (!m_testMediaStreamClient.get()) |
| 1010 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); | 1011 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); |
| 1011 return m_testMediaStreamClient.get(); | 1012 return m_testMediaStreamClient.get(); |
| 1012 } | 1013 } |
| OLD | NEW |