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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 183763027: Have ElementRareData::ensure*() methods return references (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/ElementRareData.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2137 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 { 2148 {
2149 if (!m_imeAcceptEvents) 2149 if (!m_imeAcceptEvents)
2150 return 0; 2150 return 0;
2151 2151
2152 LocalFrame* focusedFrame = focusedWebCoreFrame(); 2152 LocalFrame* focusedFrame = focusedWebCoreFrame();
2153 if (!focusedFrame) 2153 if (!focusedFrame)
2154 return 0; 2154 return 0;
2155 2155
2156 Element* target = focusedFrame->document()->focusedElement(); 2156 Element* target = focusedFrame->document()->focusedElement();
2157 if (target && target->hasInputMethodContext()) 2157 if (target && target->hasInputMethodContext())
2158 return target->inputMethodContext(); 2158 return &target->inputMethodContext();
2159 2159
2160 return 0; 2160 return 0;
2161 } 2161 }
2162 2162
2163 WebPlugin* WebViewImpl::focusedPluginIfInputMethodSupported(LocalFrame* frame) 2163 WebPlugin* WebViewImpl::focusedPluginIfInputMethodSupported(LocalFrame* frame)
2164 { 2164 {
2165 WebPluginContainerImpl* container = WebFrameImpl::pluginContainerFromNode(fr ame, WebNode(focusedElement())); 2165 WebPluginContainerImpl* container = WebFrameImpl::pluginContainerFromNode(fr ame, WebNode(focusedElement()));
2166 if (container && container->supportsInputMethod()) 2166 if (container && container->supportsInputMethod())
2167 return container->plugin(); 2167 return container->plugin();
2168 return 0; 2168 return 0;
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after
3974 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3974 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3975 3975
3976 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3976 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3977 return false; 3977 return false;
3978 3978
3979 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3979 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3980 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3980 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3981 } 3981 }
3982 3982
3983 } // namespace blink 3983 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/ElementRareData.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698