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 6360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6371 // Remove the content highlighting if any. | 6371 // Remove the content highlighting if any. |
6372 scheduleComposite(); | 6372 scheduleComposite(); |
6373 | 6373 |
6374 if (!intent.is_empty()) | 6374 if (!intent.is_empty()) |
6375 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); | 6375 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); |
6376 } | 6376 } |
6377 | 6377 |
6378 bool RenderViewImpl::openDateTimeChooser( | 6378 bool RenderViewImpl::openDateTimeChooser( |
6379 const blink::WebDateTimeChooserParams& params, | 6379 const blink::WebDateTimeChooserParams& params, |
6380 blink::WebDateTimeChooserCompletion* completion) { | 6380 blink::WebDateTimeChooserCompletion* completion) { |
6381 if (date_time_picker_client_) | |
Miguel Garcia
2013/11/26 16:07:08
Please add a comment stating when can this happen,
keishi
2013/11/27 06:58:38
Done.
JavaScript runs while the dialog is open, an
| |
6382 return false; | |
6381 date_time_picker_client_.reset( | 6383 date_time_picker_client_.reset( |
6382 new RendererDateTimePicker(this, params, completion)); | 6384 new RendererDateTimePicker(this, params, completion)); |
6383 return date_time_picker_client_->Open(); | 6385 return date_time_picker_client_->Open(); |
6384 } | 6386 } |
6385 | 6387 |
6388 void RenderViewImpl::DidDismissDateTimeDialog() { | |
Miguel Garcia
2013/11/26 16:07:08
This is such a simple implementation that perhaps
keishi
2013/11/27 06:58:38
Done.
| |
6389 DCHECK(date_time_picker_client_); | |
6390 date_time_picker_client_.reset(NULL); | |
6391 } | |
6392 | |
6386 WebMediaPlayer* RenderViewImpl::CreateAndroidWebMediaPlayer( | 6393 WebMediaPlayer* RenderViewImpl::CreateAndroidWebMediaPlayer( |
6387 WebFrame* frame, | 6394 WebFrame* frame, |
6388 const blink::WebURL& url, | 6395 const blink::WebURL& url, |
6389 WebMediaPlayerClient* client) { | 6396 WebMediaPlayerClient* client) { |
6390 GpuChannelHost* gpu_channel_host = | 6397 GpuChannelHost* gpu_channel_host = |
6391 RenderThreadImpl::current()->EstablishGpuChannelSync( | 6398 RenderThreadImpl::current()->EstablishGpuChannelSync( |
6392 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 6399 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
6393 if (!gpu_channel_host) { | 6400 if (!gpu_channel_host) { |
6394 LOG(ERROR) << "Failed to establish GPU channel for media player"; | 6401 LOG(ERROR) << "Failed to establish GPU channel for media player"; |
6395 return NULL; | 6402 return NULL; |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6679 for (size_t i = 0; i < icon_urls.size(); i++) { | 6686 for (size_t i = 0; i < icon_urls.size(); i++) { |
6680 WebURL url = icon_urls[i].iconURL(); | 6687 WebURL url = icon_urls[i].iconURL(); |
6681 if (!url.isEmpty()) | 6688 if (!url.isEmpty()) |
6682 urls.push_back(FaviconURL(url, | 6689 urls.push_back(FaviconURL(url, |
6683 ToFaviconType(icon_urls[i].iconType()))); | 6690 ToFaviconType(icon_urls[i].iconType()))); |
6684 } | 6691 } |
6685 SendUpdateFaviconURL(urls); | 6692 SendUpdateFaviconURL(urls); |
6686 } | 6693 } |
6687 | 6694 |
6688 } // namespace content | 6695 } // namespace content |
OLD | NEW |