| 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 #include "web/CompositorMutatorImpl.h" | 165 #include "web/CompositorMutatorImpl.h" |
| 166 #include "web/CompositorWorkerProxyClientImpl.h" | 166 #include "web/CompositorWorkerProxyClientImpl.h" |
| 167 #include "web/DedicatedWorkerMessagingProxyProviderImpl.h" | 167 #include "web/DedicatedWorkerMessagingProxyProviderImpl.h" |
| 168 #include "web/DevToolsEmulator.h" | 168 #include "web/DevToolsEmulator.h" |
| 169 #include "web/FullscreenController.h" | 169 #include "web/FullscreenController.h" |
| 170 #include "web/LinkHighlightImpl.h" | 170 #include "web/LinkHighlightImpl.h" |
| 171 #include "web/PageOverlay.h" | 171 #include "web/PageOverlay.h" |
| 172 #include "web/PrerendererClientImpl.h" | 172 #include "web/PrerendererClientImpl.h" |
| 173 #include "web/StorageQuotaClientImpl.h" | 173 #include "web/StorageQuotaClientImpl.h" |
| 174 #include "web/WebDevToolsAgentImpl.h" | 174 #include "web/WebDevToolsAgentImpl.h" |
| 175 #include "web/WebInputMethodControllerImpl.h" | |
| 176 #include "web/WebRemoteFrameImpl.h" | 175 #include "web/WebRemoteFrameImpl.h" |
| 177 #include "web/WebSettingsImpl.h" | 176 #include "web/WebSettingsImpl.h" |
| 178 | 177 |
| 179 #if USE(DEFAULT_RENDER_THEME) | 178 #if USE(DEFAULT_RENDER_THEME) |
| 180 #include "core/layout/LayoutThemeDefault.h" | 179 #include "core/layout/LayoutThemeDefault.h" |
| 181 #endif | 180 #endif |
| 182 | 181 |
| 183 // Get rid of WTF's pow define so we can use std::pow. | 182 // Get rid of WTF's pow define so we can use std::pow. |
| 184 #undef pow | 183 #undef pow |
| 185 #include <cmath> // for std::pow | 184 #include <cmath> // for std::pow |
| (...skipping 3321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3507 void WebViewImpl::DidCloseContextMenu() { | 3506 void WebViewImpl::DidCloseContextMenu() { |
| 3508 LocalFrame* frame = page_->GetFocusController().FocusedFrame(); | 3507 LocalFrame* frame = page_->GetFocusController().FocusedFrame(); |
| 3509 if (frame) | 3508 if (frame) |
| 3510 frame->Selection().SetCaretBlinkingSuspended(false); | 3509 frame->Selection().SetCaretBlinkingSuspended(false); |
| 3511 } | 3510 } |
| 3512 | 3511 |
| 3513 void WebViewImpl::HidePopups() { | 3512 void WebViewImpl::HidePopups() { |
| 3514 CancelPagePopup(); | 3513 CancelPagePopup(); |
| 3515 } | 3514 } |
| 3516 | 3515 |
| 3517 WebInputMethodControllerImpl* WebViewImpl::GetActiveWebInputMethodController() | 3516 WebInputMethodController* WebViewImpl::GetActiveWebInputMethodController() |
| 3518 const { | 3517 const { |
| 3519 return WebInputMethodControllerImpl::FromFrame(FocusedLocalFrameInWidget()); | 3518 WebLocalFrameBase* local_frame = |
| 3519 WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget()); |
| 3520 return local_frame ? local_frame->GetInputMethodController() : nullptr; |
| 3520 } | 3521 } |
| 3521 | 3522 |
| 3522 Color WebViewImpl::BaseBackgroundColor() const { | 3523 Color WebViewImpl::BaseBackgroundColor() const { |
| 3523 return base_background_color_override_enabled_ | 3524 return base_background_color_override_enabled_ |
| 3524 ? base_background_color_override_ | 3525 ? base_background_color_override_ |
| 3525 : base_background_color_; | 3526 : base_background_color_; |
| 3526 } | 3527 } |
| 3527 | 3528 |
| 3528 void WebViewImpl::SetBaseBackgroundColor(WebColor color) { | 3529 void WebViewImpl::SetBaseBackgroundColor(WebColor color) { |
| 3529 if (base_background_color_ == color) | 3530 if (base_background_color_ == color) |
| (...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4147 if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame()) | 4148 if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame()) |
| 4148 return nullptr; | 4149 return nullptr; |
| 4149 return focused_frame; | 4150 return focused_frame; |
| 4150 } | 4151 } |
| 4151 | 4152 |
| 4152 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const { | 4153 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const { |
| 4153 return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr; | 4154 return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr; |
| 4154 } | 4155 } |
| 4155 | 4156 |
| 4156 } // namespace blink | 4157 } // namespace blink |
| OLD | NEW |