| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 #include "platform/wtf/AutoReset.h" | 65 #include "platform/wtf/AutoReset.h" |
| 66 #include "platform/wtf/PtrUtil.h" | 66 #include "platform/wtf/PtrUtil.h" |
| 67 #include "public/web/WebAutofillClient.h" | 67 #include "public/web/WebAutofillClient.h" |
| 68 #include "public/web/WebPlugin.h" | 68 #include "public/web/WebPlugin.h" |
| 69 #include "public/web/WebRange.h" | 69 #include "public/web/WebRange.h" |
| 70 #include "public/web/WebWidgetClient.h" | 70 #include "public/web/WebWidgetClient.h" |
| 71 #include "web/AnimationWorkletProxyClientImpl.h" | 71 #include "web/AnimationWorkletProxyClientImpl.h" |
| 72 #include "web/CompositorMutatorImpl.h" | 72 #include "web/CompositorMutatorImpl.h" |
| 73 #include "web/CompositorWorkerProxyClientImpl.h" | 73 #include "web/CompositorWorkerProxyClientImpl.h" |
| 74 #include "web/WebDevToolsAgentImpl.h" | 74 #include "web/WebDevToolsAgentImpl.h" |
| 75 #include "web/WebInputMethodControllerImpl.h" | |
| 76 #include "web/WebPagePopupImpl.h" | 75 #include "web/WebPagePopupImpl.h" |
| 77 #include "web/WebRemoteFrameImpl.h" | 76 #include "web/WebRemoteFrameImpl.h" |
| 78 #include "web/WebViewFrameWidget.h" | 77 #include "web/WebViewFrameWidget.h" |
| 79 | 78 |
| 80 namespace blink { | 79 namespace blink { |
| 81 | 80 |
| 82 // WebFrameWidget ------------------------------------------------------------ | 81 // WebFrameWidget ------------------------------------------------------------ |
| 83 | 82 |
| 84 WebFrameWidget* WebFrameWidget::Create(WebWidgetClient* client, | 83 WebFrameWidget* WebFrameWidget::Create(WebWidgetClient* client, |
| 85 WebLocalFrame* local_root) { | 84 WebLocalFrame* local_root) { |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 return; | 451 return; |
| 453 | 452 |
| 454 base_background_color_ = color; | 453 base_background_color_ = color; |
| 455 UpdateBaseBackgroundColor(); | 454 UpdateBaseBackgroundColor(); |
| 456 } | 455 } |
| 457 | 456 |
| 458 void WebFrameWidgetImpl::UpdateBaseBackgroundColor() { | 457 void WebFrameWidgetImpl::UpdateBaseBackgroundColor() { |
| 459 local_root_->GetFrameView()->SetBaseBackgroundColor(BaseBackgroundColor()); | 458 local_root_->GetFrameView()->SetBaseBackgroundColor(BaseBackgroundColor()); |
| 460 } | 459 } |
| 461 | 460 |
| 462 WebInputMethodControllerImpl* | 461 WebInputMethodController* |
| 463 WebFrameWidgetImpl::GetActiveWebInputMethodController() const { | 462 WebFrameWidgetImpl::GetActiveWebInputMethodController() const { |
| 464 return WebInputMethodControllerImpl::FromFrame(FocusedLocalFrameInWidget()); | 463 WebLocalFrameBase* local_frame = |
| 464 WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget()); |
| 465 return local_frame ? local_frame->GetInputMethodController() : nullptr; |
| 465 } | 466 } |
| 466 | 467 |
| 467 void WebFrameWidgetImpl::ScheduleAnimation() { | 468 void WebFrameWidgetImpl::ScheduleAnimation() { |
| 468 if (layer_tree_view_) { | 469 if (layer_tree_view_) { |
| 469 layer_tree_view_->SetNeedsBeginFrame(); | 470 layer_tree_view_->SetNeedsBeginFrame(); |
| 470 return; | 471 return; |
| 471 } | 472 } |
| 472 DCHECK(client_); | 473 DCHECK(client_); |
| 473 client_->ScheduleAnimation(); | 474 client_->ScheduleAnimation(); |
| 474 } | 475 } |
| (...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1194 : nullptr; | 1195 : nullptr; |
| 1195 } | 1196 } |
| 1196 | 1197 |
| 1197 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { | 1198 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { |
| 1198 if (!ime_accept_events_) | 1199 if (!ime_accept_events_) |
| 1199 return nullptr; | 1200 return nullptr; |
| 1200 return FocusedLocalFrameInWidget(); | 1201 return FocusedLocalFrameInWidget(); |
| 1201 } | 1202 } |
| 1202 | 1203 |
| 1203 } // namespace blink | 1204 } // namespace blink |
| OLD | NEW |