Chromium Code Reviews| 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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 757 opened_by_user_gesture_(true), | 757 opened_by_user_gesture_(true), |
| 758 opener_suppressed_(false), | 758 opener_suppressed_(false), |
| 759 page_id_(-1), | 759 page_id_(-1), |
| 760 last_page_id_sent_to_browser_(-1), | 760 last_page_id_sent_to_browser_(-1), |
| 761 next_page_id_(params->next_page_id), | 761 next_page_id_(params->next_page_id), |
| 762 history_list_offset_(-1), | 762 history_list_offset_(-1), |
| 763 history_list_length_(0), | 763 history_list_length_(0), |
| 764 target_url_status_(TARGET_NONE), | 764 target_url_status_(TARGET_NONE), |
| 765 selection_text_offset_(0), | 765 selection_text_offset_(0), |
| 766 selection_range_(ui::Range::InvalidRange()), | 766 selection_range_(ui::Range::InvalidRange()), |
| 767 #if defined(OS_ANDROID) | |
| 768 top_controls_constraints_(cc::NONE), | |
|
jamesr
2013/06/11 05:11:27
does 'NONE' make sense? the top controls have to e
Jinsuk Kim
2013/06/11 05:23:59
How about 'INVALID' which indicates it is not a va
| |
| 769 #endif | |
| 767 cached_is_main_frame_pinned_to_left_(false), | 770 cached_is_main_frame_pinned_to_left_(false), |
| 768 cached_is_main_frame_pinned_to_right_(false), | 771 cached_is_main_frame_pinned_to_right_(false), |
| 769 cached_has_main_frame_horizontal_scrollbar_(false), | 772 cached_has_main_frame_horizontal_scrollbar_(false), |
| 770 cached_has_main_frame_vertical_scrollbar_(false), | 773 cached_has_main_frame_vertical_scrollbar_(false), |
| 771 cookie_jar_(this), | 774 cookie_jar_(this), |
| 772 notification_provider_(NULL), | 775 notification_provider_(NULL), |
| 773 geolocation_dispatcher_(NULL), | 776 geolocation_dispatcher_(NULL), |
| 774 input_tag_speech_dispatcher_(NULL), | 777 input_tag_speech_dispatcher_(NULL), |
| 775 speech_recognition_dispatcher_(NULL), | 778 speech_recognition_dispatcher_(NULL), |
| 776 device_orientation_dispatcher_(NULL), | 779 device_orientation_dispatcher_(NULL), |
| (...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2335 if (!frame->executeCommand(WebString::fromUTF8(it->name), | 2338 if (!frame->executeCommand(WebString::fromUTF8(it->name), |
| 2336 WebString::fromUTF8(it->value), | 2339 WebString::fromUTF8(it->value), |
| 2337 GetFocusedNode())) | 2340 GetFocusedNode())) |
| 2338 break; | 2341 break; |
| 2339 did_execute_command = true; | 2342 did_execute_command = true; |
| 2340 } | 2343 } |
| 2341 | 2344 |
| 2342 return did_execute_command; | 2345 return did_execute_command; |
| 2343 } | 2346 } |
| 2344 | 2347 |
| 2348 #if defined(OS_ANDROID) | |
| 2349 void RenderViewImpl::didScrollWithKeyboard(const WebKit::WebSize& delta) { | |
|
jamesr
2013/06/11 05:11:27
you've declared the function in the header outside
Jinsuk Kim
2013/06/11 05:23:59
Moved #if's inside.
| |
| 2350 if (top_controls_constraints_ == cc::NONE || delta.height == 0) | |
| 2351 return; | |
| 2352 compositor_->UpdateTopControlsState(top_controls_constraints_, | |
| 2353 delta.height < 0 ? cc::SHOWN : cc::HIDDEN, | |
| 2354 true); | |
| 2355 } | |
| 2356 #endif | |
| 2357 | |
| 2345 WebKit::WebColorChooser* RenderViewImpl::createColorChooser( | 2358 WebKit::WebColorChooser* RenderViewImpl::createColorChooser( |
| 2346 WebKit::WebColorChooserClient* client, | 2359 WebKit::WebColorChooserClient* client, |
| 2347 const WebKit::WebColor& initial_color) { | 2360 const WebKit::WebColor& initial_color) { |
| 2348 RendererWebColorChooserImpl* color_chooser = | 2361 RendererWebColorChooserImpl* color_chooser = |
| 2349 new RendererWebColorChooserImpl(this, client); | 2362 new RendererWebColorChooserImpl(this, client); |
| 2350 color_chooser->Open(static_cast<SkColor>(initial_color)); | 2363 color_chooser->Open(static_cast<SkColor>(initial_color)); |
| 2351 return color_chooser; | 2364 return color_chooser; |
| 2352 } | 2365 } |
| 2353 | 2366 |
| 2354 bool RenderViewImpl::runFileChooser( | 2367 bool RenderViewImpl::runFileChooser( |
| (...skipping 4368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6723 WebURL url = icon_urls[i].iconURL(); | 6736 WebURL url = icon_urls[i].iconURL(); |
| 6724 if (!url.isEmpty()) | 6737 if (!url.isEmpty()) |
| 6725 urls.push_back(FaviconURL(url, | 6738 urls.push_back(FaviconURL(url, |
| 6726 ToFaviconType(icon_urls[i].iconType()))); | 6739 ToFaviconType(icon_urls[i].iconType()))); |
| 6727 } | 6740 } |
| 6728 SendUpdateFaviconURL(urls); | 6741 SendUpdateFaviconURL(urls); |
| 6729 } | 6742 } |
| 6730 | 6743 |
| 6731 | 6744 |
| 6732 } // namespace content | 6745 } // namespace content |
| OLD | NEW |