Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: third_party/WebKit/Source/web/ChromeClientImpl.cpp

Issue 2230993002: Refactor composited selection code out of WebViewImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix PDF print dialog tests. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 void ChromeClientImpl::enterFullScreenForElement(Element* element) 818 void ChromeClientImpl::enterFullScreenForElement(Element* element)
819 { 819 {
820 m_webView->enterFullScreenForElement(element); 820 m_webView->enterFullScreenForElement(element);
821 } 821 }
822 822
823 void ChromeClientImpl::exitFullScreenForElement(Element* element) 823 void ChromeClientImpl::exitFullScreenForElement(Element* element)
824 { 824 {
825 m_webView->exitFullScreenForElement(element); 825 m_webView->exitFullScreenForElement(element);
826 } 826 }
827 827
828 void ChromeClientImpl::clearCompositedSelection() 828 void ChromeClientImpl::clearCompositedSelection(LocalFrame* frame)
829 { 829 {
830 m_webView->clearCompositedSelection(); 830 LocalFrame* localRoot = frame->localFrameRoot();
831 auto client = WebLocalFrameImpl::fromFrame(localRoot)->frameWidget()->client ();
bokan 2016/08/11 14:14:06 I don't think `auto` helps in these cases. My read
wjmaclean 2016/08/11 14:35:06 Done.
832 if (!client)
833 return;
834
835 auto layerTreeView = client->layerTreeView();
836 if (layerTreeView)
837 layerTreeView->clearSelection();
831 } 838 }
832 839
833 void ChromeClientImpl::updateCompositedSelection(const CompositedSelection& sele ction) 840 void ChromeClientImpl::updateCompositedSelection(LocalFrame* frame, const Compos itedSelection& selection)
834 { 841 {
835 m_webView->updateCompositedSelection(WebSelection(selection)); 842 LocalFrame* localRoot = frame->localFrameRoot();
843 auto client = WebLocalFrameImpl::fromFrame(localRoot)->frameWidget()->client ();
844 if (!client)
845 return;
846
847 auto layerTreeView = client->layerTreeView();
848 if (layerTreeView)
849 layerTreeView->registerSelection(WebSelection(selection));
836 } 850 }
837 851
838 bool ChromeClientImpl::hasOpenedPopup() const 852 bool ChromeClientImpl::hasOpenedPopup() const
839 { 853 {
840 return m_webView->hasOpenedPopup(); 854 return m_webView->hasOpenedPopup();
841 } 855 }
842 856
843 PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select) 857 PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
844 { 858 {
845 notifyPopupOpeningObservers(); 859 notifyPopupOpeningObservers();
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 { 1093 {
1080 return wrapUnique(m_webView->scheduler()->createFrameScheduler(blameContext) .release()); 1094 return wrapUnique(m_webView->scheduler()->createFrameScheduler(blameContext) .release());
1081 } 1095 }
1082 1096
1083 double ChromeClientImpl::lastFrameTimeMonotonic() const 1097 double ChromeClientImpl::lastFrameTimeMonotonic() const
1084 { 1098 {
1085 return m_webView->lastFrameTimeMonotonic(); 1099 return m_webView->lastFrameTimeMonotonic();
1086 } 1100 }
1087 1101
1088 } // namespace blink 1102 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698