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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2650113004: [WIP] Add support for Android SuggestionSpans when editing text (Closed)
Patch Set: Created 3 years, 10 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2031 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 if (!localFrame) { 2042 if (!localFrame) {
2043 // Clearing the mainframe when there is no focused frame (and hence 2043 // Clearing the mainframe when there is no focused frame (and hence
2044 // no localFrame) is legacy behaviour, and implemented here to 2044 // no localFrame) is legacy behaviour, and implemented here to
2045 // satisfy ParameterizedWebFrameTest.CompositedSelectionBoundsCleared's 2045 // satisfy ParameterizedWebFrameTest.CompositedSelectionBoundsCleared's
2046 // first check that the composited selection has been cleared even 2046 // first check that the composited selection has been cleared even
2047 // though no frame has focus yet. If this is not desired, then the 2047 // though no frame has focus yet. If this is not desired, then the
2048 // expectation needs to be removed from the test. 2048 // expectation needs to be removed from the test.
2049 localFrame = m_frame->localFrameRoot(); 2049 localFrame = m_frame->localFrameRoot();
2050 } 2050 }
2051 2051
2052 if (localFrame) 2052 if (localFrame) {
2053 page->chromeClient().clearCompositedSelection(localFrame); 2053 page->chromeClient().clearCompositedSelection(localFrame);
2054 }
2054 } 2055 }
2055 } 2056 }
2056 2057
2057 HostWindow* FrameView::getHostWindow() const { 2058 HostWindow* FrameView::getHostWindow() const {
2058 Page* page = frame().page(); 2059 Page* page = frame().page();
2059 if (!page) 2060 if (!page)
2060 return nullptr; 2061 return nullptr;
2061 return &page->chromeClient(); 2062 return &page->chromeClient();
2062 } 2063 }
2063 2064
(...skipping 2997 matching lines...) Expand 10 before | Expand all | Expand 10 after
5061 std::unique_ptr<CompositorAnimationTimeline> timeline) { 5062 std::unique_ptr<CompositorAnimationTimeline> timeline) {
5062 m_animationTimeline = std::move(timeline); 5063 m_animationTimeline = std::move(timeline);
5063 } 5064 }
5064 5065
5065 void FrameView::setAnimationHost( 5066 void FrameView::setAnimationHost(
5066 std::unique_ptr<CompositorAnimationHost> host) { 5067 std::unique_ptr<CompositorAnimationHost> host) {
5067 m_animationHost = std::move(host); 5068 m_animationHost = std::move(host);
5068 } 5069 }
5069 5070
5070 } // namespace blink 5071 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698