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 3709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3720 | 3720 |
3721 void WebViewImpl::setPageOverlayColor(WebColor color) { | 3721 void WebViewImpl::setPageOverlayColor(WebColor color) { |
3722 if (m_pageColorOverlay) | 3722 if (m_pageColorOverlay) |
3723 m_pageColorOverlay.reset(); | 3723 m_pageColorOverlay.reset(); |
3724 | 3724 |
3725 if (color == Color::transparent) | 3725 if (color == Color::transparent) |
3726 return; | 3726 return; |
3727 | 3727 |
3728 m_pageColorOverlay = PageOverlay::create( | 3728 m_pageColorOverlay = PageOverlay::create( |
3729 mainFrameImpl(), WTF::makeUnique<ColorOverlay>(color)); | 3729 mainFrameImpl(), WTF::makeUnique<ColorOverlay>(color)); |
3730 m_pageColorOverlay->update(); | 3730 |
| 3731 // Run compositing update before calling updatePageOverlays. |
| 3732 mainFrameImpl() |
| 3733 ->frameView() |
| 3734 ->updateLifecycleToCompositingCleanPlusScrolling(); |
| 3735 |
| 3736 updatePageOverlays(); |
3731 } | 3737 } |
3732 | 3738 |
3733 WebPageImportanceSignals* WebViewImpl::pageImportanceSignals() { | 3739 WebPageImportanceSignals* WebViewImpl::pageImportanceSignals() { |
3734 return &m_pageImportanceSignals; | 3740 return &m_pageImportanceSignals; |
3735 } | 3741 } |
3736 | 3742 |
3737 Element* WebViewImpl::focusedElement() const { | 3743 Element* WebViewImpl::focusedElement() const { |
3738 LocalFrame* frame = m_page->focusController().focusedFrame(); | 3744 LocalFrame* frame = m_page->focusController().focusedFrame(); |
3739 if (!frame) | 3745 if (!frame) |
3740 return nullptr; | 3746 return nullptr; |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4166 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) | 4172 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) |
4167 return nullptr; | 4173 return nullptr; |
4168 return focusedFrame; | 4174 return focusedFrame; |
4169 } | 4175 } |
4170 | 4176 |
4171 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { | 4177 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { |
4172 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4178 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
4173 } | 4179 } |
4174 | 4180 |
4175 } // namespace blink | 4181 } // namespace blink |
OLD | NEW |