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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 2730573003: Moved FrameHost::m_visualViewport to Page (Closed)
Patch Set: Fixed some compile errors on mac and android Created 3 years, 9 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after
1787 #else 1787 #else
1788 int rightAligned = 0; 1788 int rightAligned = 0;
1789 #endif 1789 #endif
1790 IntPoint locationInRootFrame; 1790 IntPoint locationInRootFrame;
1791 1791
1792 Element* focusedElement = 1792 Element* focusedElement =
1793 overrideTargetElement ? overrideTargetElement : doc->focusedElement(); 1793 overrideTargetElement ? overrideTargetElement : doc->focusedElement();
1794 FrameSelection& selection = m_frame->selection(); 1794 FrameSelection& selection = m_frame->selection();
1795 Position start = 1795 Position start =
1796 selection.computeVisibleSelectionInDOMTreeDeprecated().start(); 1796 selection.computeVisibleSelectionInDOMTreeDeprecated().start();
1797 VisualViewport& visualViewport = frameHost()->visualViewport(); 1797 VisualViewport& visualViewport = m_frame->page()->visualViewport();
1798 1798
1799 if (!overrideTargetElement && start.anchorNode() && 1799 if (!overrideTargetElement && start.anchorNode() &&
1800 (selection.computeVisibleSelectionInDOMTreeDeprecated() 1800 (selection.computeVisibleSelectionInDOMTreeDeprecated()
1801 .rootEditableElement() || 1801 .rootEditableElement() ||
1802 selection.computeVisibleSelectionInDOMTreeDeprecated().isRange())) { 1802 selection.computeVisibleSelectionInDOMTreeDeprecated().isRange())) {
1803 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets 1803 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
1804 // needs to be audited. See http://crbug.com/590369 for more details. 1804 // needs to be audited. See http://crbug.com/590369 for more details.
1805 doc->updateStyleAndLayoutIgnorePendingStylesheets(); 1805 doc->updateStyleAndLayoutIgnorePendingStylesheets();
1806 1806
1807 IntRect firstRect = m_frame->editor().firstRectForRange( 1807 IntRect firstRect = m_frame->editor().firstRectForRange(
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
2094 } 2094 }
2095 2095
2096 FrameHost* EventHandler::frameHost() const { 2096 FrameHost* EventHandler::frameHost() const {
2097 if (!m_frame->page()) 2097 if (!m_frame->page())
2098 return nullptr; 2098 return nullptr;
2099 2099
2100 return &m_frame->page()->frameHost(); 2100 return &m_frame->page()->frameHost();
2101 } 2101 }
2102 2102
2103 } // namespace blink 2103 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/ImageDocument.cpp ('k') | third_party/WebKit/Source/core/input/GestureManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698