| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser/renderer_host/test/test_render_view_host.h" | 5 #include "chrome/browser/renderer_host/test/test_render_view_host.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_url_handler.h" | 7 #include "chrome/browser/browser_url_handler.h" |
| 8 #include "chrome/browser/renderer_host/test/test_backing_store.h" | 8 #include "chrome/browser/renderer_host/test/test_backing_store.h" |
| 9 #include "chrome/browser/tab_contents/test_tab_contents.h" | 9 #include "chrome/browser/tab_contents/test_tab_contents.h" |
| 10 #include "chrome/common/dom_storage_common.h" | 10 #include "chrome/common/dom_storage_common.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 gfx::PluginWindowHandle window, | 144 gfx::PluginWindowHandle window, |
| 145 int32 width, | 145 int32 width, |
| 146 int32 height, | 146 int32 height, |
| 147 TransportDIB::Handle transport_dib) { | 147 TransportDIB::Handle transport_dib) { |
| 148 } | 148 } |
| 149 | 149 |
| 150 void TestRenderWidgetHostView::AcceleratedSurfaceBuffersSwapped( | 150 void TestRenderWidgetHostView::AcceleratedSurfaceBuffersSwapped( |
| 151 gfx::PluginWindowHandle window) { | 151 gfx::PluginWindowHandle window) { |
| 152 } | 152 } |
| 153 | 153 |
| 154 void TestRenderWidgetHostView::DrawAcceleratedSurfaceInstances( | 154 void TestRenderWidgetHostView::GpuRenderingStateDidChange() { |
| 155 CGLContextObj context) { | |
| 156 } | 155 } |
| 157 #endif | 156 #endif |
| 158 | 157 |
| 159 void RenderViewHostTestHarness::NavigateAndCommit(const GURL& url) { | 158 void RenderViewHostTestHarness::NavigateAndCommit(const GURL& url) { |
| 160 controller().LoadURL(url, GURL(), 0); | 159 controller().LoadURL(url, GURL(), 0); |
| 161 GURL loaded_url(url); | 160 GURL loaded_url(url); |
| 162 bool reverse_on_redirect = false; | 161 bool reverse_on_redirect = false; |
| 163 BrowserURLHandler::RewriteURLIfNecessary( | 162 BrowserURLHandler::RewriteURLIfNecessary( |
| 164 &loaded_url, profile(), &reverse_on_redirect); | 163 &loaded_url, profile(), &reverse_on_redirect); |
| 165 rvh()->SendNavigate(process()->max_page_id() + 1, loaded_url); | 164 rvh()->SendNavigate(process()->max_page_id() + 1, loaded_url); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 187 contents_.reset(); | 186 contents_.reset(); |
| 188 | 187 |
| 189 // Make sure that we flush any messages related to TabContents destruction | 188 // Make sure that we flush any messages related to TabContents destruction |
| 190 // before we destroy the profile. | 189 // before we destroy the profile. |
| 191 MessageLoop::current()->RunAllPending(); | 190 MessageLoop::current()->RunAllPending(); |
| 192 | 191 |
| 193 // Release the profile on the UI thread. | 192 // Release the profile on the UI thread. |
| 194 message_loop_.DeleteSoon(FROM_HERE, profile_.release()); | 193 message_loop_.DeleteSoon(FROM_HERE, profile_.release()); |
| 195 message_loop_.RunAllPending(); | 194 message_loop_.RunAllPending(); |
| 196 } | 195 } |
| OLD | NEW |