| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 #include <wtf/PassOwnPtr.h> | 76 #include <wtf/PassOwnPtr.h> |
| 77 #include <wtf/Vector.h> | 77 #include <wtf/Vector.h> |
| 78 | 78 |
| 79 using namespace WebCore; | 79 using namespace WebCore; |
| 80 using namespace WebKit; | 80 using namespace WebKit; |
| 81 using namespace WebTestRunner; | 81 using namespace WebTestRunner; |
| 82 using namespace std; | 82 using namespace std; |
| 83 | 83 |
| 84 static const int screenWidth = 1920; | 84 static const int screenWidth = 1920; |
| 85 static const int screenHeight = 1080; | 85 static const int screenHeight = 1080; |
| 86 static const int screenUnavailableBorder = 8; | 86 |
| 87 const int WebViewHost::screenUnavailableBorder = 8; |
| 87 | 88 |
| 88 static int nextPageID = 1; | 89 static int nextPageID = 1; |
| 89 | 90 |
| 90 // WebViewClient ------------------------------------------------------------- | 91 // WebViewClient ------------------------------------------------------------- |
| 91 | 92 |
| 92 WebView* WebViewHost::createView(WebFrame* creator, const WebURLRequest&, const
WebWindowFeatures&, const WebString&, WebNavigationPolicy) | 93 WebView* WebViewHost::createView(WebFrame* creator, const WebURLRequest&, const
WebWindowFeatures&, const WebString&, WebNavigationPolicy) |
| 93 { | 94 { |
| 94 WebUserGestureIndicator::consumeUserGesture(); | 95 WebUserGestureIndicator::consumeUserGesture(); |
| 95 return m_shell->createNewWindow(WebURL())->webView(); | 96 return m_shell->createNewWindow(WebURL())->webView(); |
| 96 } | 97 } |
| (...skipping 906 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 |