| 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 3486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3497 } | 3497 } |
| 3498 | 3498 |
| 3499 WebInputMethodController* WebViewImpl::GetActiveWebInputMethodController() | 3499 WebInputMethodController* WebViewImpl::GetActiveWebInputMethodController() |
| 3500 const { | 3500 const { |
| 3501 WebLocalFrameBase* local_frame = | 3501 WebLocalFrameBase* local_frame = |
| 3502 WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget()); | 3502 WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget()); |
| 3503 return local_frame ? local_frame->GetInputMethodController() : nullptr; | 3503 return local_frame ? local_frame->GetInputMethodController() : nullptr; |
| 3504 } | 3504 } |
| 3505 | 3505 |
| 3506 void WebViewImpl::RequestDecode( | 3506 void WebViewImpl::RequestDecode( |
| 3507 sk_sp<SkImage> image, | 3507 const PaintImage& image, |
| 3508 std::unique_ptr<WTF::Function<void(bool)>> callback) { | 3508 std::unique_ptr<WTF::Function<void(bool)>> callback) { |
| 3509 layer_tree_view_->RequestDecode(std::move(image), | 3509 layer_tree_view_->RequestDecode(image, |
| 3510 ConvertToBaseCallback(std::move(callback))); | 3510 ConvertToBaseCallback(std::move(callback))); |
| 3511 } | 3511 } |
| 3512 | 3512 |
| 3513 Color WebViewImpl::BaseBackgroundColor() const { | 3513 Color WebViewImpl::BaseBackgroundColor() const { |
| 3514 return base_background_color_override_enabled_ | 3514 return base_background_color_override_enabled_ |
| 3515 ? base_background_color_override_ | 3515 ? base_background_color_override_ |
| 3516 : base_background_color_; | 3516 : base_background_color_; |
| 3517 } | 3517 } |
| 3518 | 3518 |
| 3519 void WebViewImpl::SetBaseBackgroundColor(WebColor color) { | 3519 void WebViewImpl::SetBaseBackgroundColor(WebColor color) { |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4139 if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame()) | 4139 if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame()) |
| 4140 return nullptr; | 4140 return nullptr; |
| 4141 return focused_frame; | 4141 return focused_frame; |
| 4142 } | 4142 } |
| 4143 | 4143 |
| 4144 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const { | 4144 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const { |
| 4145 return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr; | 4145 return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr; |
| 4146 } | 4146 } |
| 4147 | 4147 |
| 4148 } // namespace blink | 4148 } // namespace blink |
| OLD | NEW |