| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 3481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3492 CancelPagePopup(); | 3492 CancelPagePopup(); |
| 3493 } | 3493 } |
| 3494 | 3494 |
| 3495 WebInputMethodController* WebViewImpl::GetActiveWebInputMethodController() | 3495 WebInputMethodController* WebViewImpl::GetActiveWebInputMethodController() |
| 3496 const { | 3496 const { |
| 3497 WebLocalFrameBase* local_frame = | 3497 WebLocalFrameBase* local_frame = |
| 3498 WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget()); | 3498 WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget()); |
| 3499 return local_frame ? local_frame->GetInputMethodController() : nullptr; | 3499 return local_frame ? local_frame->GetInputMethodController() : nullptr; |
| 3500 } | 3500 } |
| 3501 | 3501 |
| 3502 void WebViewImpl::RequestDecode( |
| 3503 sk_sp<SkImage> image, |
| 3504 std::unique_ptr<WTF::Function<void(bool)>> callback) { |
| 3505 layer_tree_view_->RequestDecode(std::move(image), |
| 3506 ConvertToBaseCallback(std::move(callback))); |
| 3507 } |
| 3508 |
| 3502 Color WebViewImpl::BaseBackgroundColor() const { | 3509 Color WebViewImpl::BaseBackgroundColor() const { |
| 3503 return base_background_color_override_enabled_ | 3510 return base_background_color_override_enabled_ |
| 3504 ? base_background_color_override_ | 3511 ? base_background_color_override_ |
| 3505 : base_background_color_; | 3512 : base_background_color_; |
| 3506 } | 3513 } |
| 3507 | 3514 |
| 3508 void WebViewImpl::SetBaseBackgroundColor(WebColor color) { | 3515 void WebViewImpl::SetBaseBackgroundColor(WebColor color) { |
| 3509 if (base_background_color_ == color) | 3516 if (base_background_color_ == color) |
| 3510 return; | 3517 return; |
| 3511 | 3518 |
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4128 if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame()) | 4135 if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame()) |
| 4129 return nullptr; | 4136 return nullptr; |
| 4130 return focused_frame; | 4137 return focused_frame; |
| 4131 } | 4138 } |
| 4132 | 4139 |
| 4133 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const { | 4140 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const { |
| 4134 return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr; | 4141 return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr; |
| 4135 } | 4142 } |
| 4136 | 4143 |
| 4137 } // namespace blink | 4144 } // namespace blink |
| OLD | NEW |