| 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 "content/renderer/render_view.h" | 5 #include "content/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 1951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1962 if (RenderThread::current()) // Will be NULL during unit tests. | 1962 if (RenderThread::current()) // Will be NULL during unit tests. |
| 1963 RenderThread::current()->DoNotSuspendWebKitSharedTimer(); | 1963 RenderThread::current()->DoNotSuspendWebKitSharedTimer(); |
| 1964 | 1964 |
| 1965 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_)); | 1965 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_)); |
| 1966 } | 1966 } |
| 1967 | 1967 |
| 1968 // WebKit::WebFrameClient ----------------------------------------------------- | 1968 // WebKit::WebFrameClient ----------------------------------------------------- |
| 1969 | 1969 |
| 1970 WebPlugin* RenderView::createPlugin(WebFrame* frame, | 1970 WebPlugin* RenderView::createPlugin(WebFrame* frame, |
| 1971 const WebPluginParams& params) { | 1971 const WebPluginParams& params) { |
| 1972 return content::GetContentClient()->renderer()->CreatePlugin( | 1972 WebPlugin* plugin = NULL; |
| 1973 this, frame, params); | 1973 if (content::GetContentClient()->renderer()->OverrideCreatePlugin( |
| 1974 this, frame, params, &plugin)) { |
| 1975 return plugin; |
| 1976 } |
| 1977 |
| 1978 return CreatePluginNoCheck(frame, params); |
| 1974 } | 1979 } |
| 1975 | 1980 |
| 1976 WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) { | 1981 WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) { |
| 1977 WebApplicationCacheHostImpl* appcache_host = | 1982 WebApplicationCacheHostImpl* appcache_host = |
| 1978 WebApplicationCacheHostImpl::FromFrame(frame); | 1983 WebApplicationCacheHostImpl::FromFrame(frame); |
| 1979 int appcache_host_id = appcache_host ? appcache_host->host_id() : 0; | 1984 int appcache_host_id = appcache_host ? appcache_host->host_id() : 0; |
| 1980 return new WebWorkerProxy(client, RenderThread::current(), routing_id_, | 1985 return new WebWorkerProxy(client, RenderThread::current(), routing_id_, |
| 1981 appcache_host_id); | 1986 appcache_host_id); |
| 1982 } | 1987 } |
| 1983 | 1988 |
| (...skipping 2660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4644 } | 4649 } |
| 4645 | 4650 |
| 4646 void RenderView::OnLockMouseACK(bool succeeded) { | 4651 void RenderView::OnLockMouseACK(bool succeeded) { |
| 4647 pepper_delegate_.OnLockMouseACK(succeeded); | 4652 pepper_delegate_.OnLockMouseACK(succeeded); |
| 4648 } | 4653 } |
| 4649 | 4654 |
| 4650 void RenderView::OnMouseLockLost() { | 4655 void RenderView::OnMouseLockLost() { |
| 4651 pepper_delegate_.OnMouseLockLost(); | 4656 pepper_delegate_.OnMouseLockLost(); |
| 4652 } | 4657 } |
| 4653 | 4658 |
| OLD | NEW |