| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebFrameTestProxy_h | 31 #ifndef WebFrameTestProxy_h |
| 32 #define WebFrameTestProxy_h | 32 #define WebFrameTestProxy_h |
| 33 | 33 |
| 34 #include "WebTestProxy.h" | 34 #include "WebTestProxy.h" |
| 35 #include "public/platform/WebNonCopyable.h" |
| 35 | 36 |
| 36 namespace WebTestRunner { | 37 namespace WebTestRunner { |
| 37 | 38 |
| 38 // Templetized wrapper around RenderFrameImpl objects, which implement | 39 // Templetized wrapper around RenderFrameImpl objects, which implement |
| 39 // the WebFrameClient interface. | 40 // the WebFrameClient interface. |
| 40 template<class Base, typename P, typename R> | 41 template<class Base, typename P, typename R> |
| 41 class WebFrameTestProxy : public Base { | 42 class WebFrameTestProxy : public Base, public WebKit::WebNonCopyable { |
| 42 public: | 43 public: |
| 43 WebFrameTestProxy(P p, R r) | 44 WebFrameTestProxy(P p, R r) |
| 44 : Base(p, r) | 45 : Base(p, r) |
| 45 , m_baseProxy(0) | 46 , m_baseProxy(0) |
| 46 , m_version(0) { } | 47 , m_version(0) { } |
| 47 | 48 |
| 48 virtual ~WebFrameTestProxy() { } | 49 virtual ~WebFrameTestProxy() { } |
| 49 | 50 |
| 50 void setBaseProxy(WebTestProxyBase* proxy) | 51 void setBaseProxy(WebTestProxyBase* proxy) |
| 51 { | 52 { |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 | 171 |
| 171 // This is used to incrementally change code between Blink and Chromium. | 172 // This is used to incrementally change code between Blink and Chromium. |
| 172 // 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 |
| 173 // creating this object. | 174 // creating this object. |
| 174 int m_version; | 175 int m_version; |
| 175 }; | 176 }; |
| 176 | 177 |
| 177 } | 178 } |
| 178 | 179 |
| 179 #endif // WebTestProxy_h | 180 #endif // WebTestProxy_h |
| OLD | NEW |