| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2054 #else | 2054 #else |
| 2055 // TODO(port): Implement the infobar that accompanies the default plugin. | 2055 // TODO(port): Implement the infobar that accompanies the default plugin. |
| 2056 // Linux: http://crbug.com/10952 | 2056 // Linux: http://crbug.com/10952 |
| 2057 // Mac: http://crbug.com/17392 | 2057 // Mac: http://crbug.com/17392 |
| 2058 NOTIMPLEMENTED(); | 2058 NOTIMPLEMENTED(); |
| 2059 #endif | 2059 #endif |
| 2060 } | 2060 } |
| 2061 | 2061 |
| 2062 // WebKit::WebViewClient ------------------------------------------------------ | 2062 // WebKit::WebViewClient ------------------------------------------------------ |
| 2063 | 2063 |
| 2064 // TODO(jochen): remove once WebKit side is up to date. | |
| 2065 WebView* RenderView::createView( | |
| 2066 WebFrame* creator, | |
| 2067 const WebWindowFeatures& features, | |
| 2068 const WebString& frame_name) { | |
| 2069 return createView(creator, WebURLRequest(), features, frame_name); | |
| 2070 } | |
| 2071 | |
| 2072 WebView* RenderView::createView( | 2064 WebView* RenderView::createView( |
| 2073 WebFrame* creator, | 2065 WebFrame* creator, |
| 2074 const WebURLRequest& request, | 2066 const WebURLRequest& request, |
| 2075 const WebWindowFeatures& features, | 2067 const WebWindowFeatures& features, |
| 2076 const WebString& frame_name) { | 2068 const WebString& frame_name) { |
| 2077 // Check to make sure we aren't overloading on popups. | 2069 // Check to make sure we aren't overloading on popups. |
| 2078 if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups) | 2070 if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups) |
| 2079 return NULL; | 2071 return NULL; |
| 2080 | 2072 |
| 2081 // This window can't be closed from a window.close() call until we receive a | 2073 // This window can't be closed from a window.close() call until we receive a |
| (...skipping 3714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5796 } | 5788 } |
| 5797 #endif | 5789 #endif |
| 5798 | 5790 |
| 5799 void RenderView::OnJavaScriptStressTestControl(int cmd, int param) { | 5791 void RenderView::OnJavaScriptStressTestControl(int cmd, int param) { |
| 5800 if (cmd == kJavaScriptStressTestSetStressRunType) { | 5792 if (cmd == kJavaScriptStressTestSetStressRunType) { |
| 5801 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param)); | 5793 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param)); |
| 5802 } else if (cmd == kJavaScriptStressTestPrepareStressRun) { | 5794 } else if (cmd == kJavaScriptStressTestPrepareStressRun) { |
| 5803 v8::Testing::PrepareStressRun(param); | 5795 v8::Testing::PrepareStressRun(param); |
| 5804 } | 5796 } |
| 5805 } | 5797 } |
| OLD | NEW |