| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 799 | 799 |
| 800 // If file chooser is still waiting for answer, dispatch empty answer. | 800 // If file chooser is still waiting for answer, dispatch empty answer. |
| 801 while (!file_chooser_completions_.empty()) { | 801 while (!file_chooser_completions_.empty()) { |
| 802 if (file_chooser_completions_.front()->completion) { | 802 if (file_chooser_completions_.front()->completion) { |
| 803 file_chooser_completions_.front()->completion->didChooseFile( | 803 file_chooser_completions_.front()->completion->didChooseFile( |
| 804 WebVector<WebString>()); | 804 WebVector<WebString>()); |
| 805 } | 805 } |
| 806 file_chooser_completions_.pop_front(); | 806 file_chooser_completions_.pop_front(); |
| 807 } | 807 } |
| 808 | 808 |
| 809 #if defined(OS_ANDROID) |
| 810 // The date/time picker client is both a scoped_ptr member of this class and |
| 811 // a RenderViewObserver. Reset it to prevent double deletion. |
| 812 date_time_picker_client_.reset(); |
| 813 #endif |
| 814 |
| 809 #if defined(OS_MACOSX) | 815 #if defined(OS_MACOSX) |
| 810 // Destroy all fake plugin window handles on the browser side. | 816 // Destroy all fake plugin window handles on the browser side. |
| 811 while (!fake_plugin_window_handles_.empty()) { | 817 while (!fake_plugin_window_handles_.empty()) { |
| 812 // Make sure no NULL plugin window handles were inserted into this list. | 818 // Make sure no NULL plugin window handles were inserted into this list. |
| 813 DCHECK(*fake_plugin_window_handles_.begin()); | 819 DCHECK(*fake_plugin_window_handles_.begin()); |
| 814 // DestroyFakePluginWindowHandle modifies fake_plugin_window_handles_. | 820 // DestroyFakePluginWindowHandle modifies fake_plugin_window_handles_. |
| 815 DestroyFakePluginWindowHandle(*fake_plugin_window_handles_.begin()); | 821 DestroyFakePluginWindowHandle(*fake_plugin_window_handles_.begin()); |
| 816 } | 822 } |
| 817 #endif | 823 #endif |
| 818 | 824 |
| (...skipping 5843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6662 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6668 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
| 6663 RenderProcess::current()->ReleaseTransportDIB(dib); | 6669 RenderProcess::current()->ReleaseTransportDIB(dib); |
| 6664 } | 6670 } |
| 6665 | 6671 |
| 6666 void RenderViewImpl::DidCommitCompositorFrame() { | 6672 void RenderViewImpl::DidCommitCompositorFrame() { |
| 6667 RenderWidget::DidCommitCompositorFrame(); | 6673 RenderWidget::DidCommitCompositorFrame(); |
| 6668 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | 6674 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); |
| 6669 } | 6675 } |
| 6670 | 6676 |
| 6671 } // namespace content | 6677 } // namespace content |
| OLD | NEW |