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

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

Issue 326393003: Oilpan: Change Persistent<> data members to Member<> in HitTestResult. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Follow review comments Created 6 years, 6 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
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 3139 matching lines...) Expand 10 before | Expand all | Expand 10 after
3150 break; 3150 break;
3151 default: 3151 default:
3152 ASSERT_NOT_REACHED(); 3152 ASSERT_NOT_REACHED();
3153 } 3153 }
3154 } 3154 }
3155 } 3155 }
3156 } 3156 }
3157 3157
3158 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) 3158 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point)
3159 { 3159 {
3160 return coreHitTestResultAt(point);
3161 }
3162
3163 HitTestResult WebViewImpl::coreHitTestResultAt(const WebPoint& point)
3164 {
3160 IntPoint scaledPoint = point; 3165 IntPoint scaledPoint = point;
3161 scaledPoint.scale(1 / pageScaleFactor(), 1 / pageScaleFactor()); 3166 scaledPoint.scale(1 / pageScaleFactor(), 1 / pageScaleFactor());
3162 return hitTestResultForWindowPos(scaledPoint); 3167 return hitTestResultForWindowPos(scaledPoint);
3163 } 3168 }
3164 3169
3165 void WebViewImpl::copyImageAt(const WebPoint& point) 3170 void WebViewImpl::copyImageAt(const WebPoint& point)
3166 { 3171 {
3167 if (!m_page) 3172 if (!m_page)
3168 return; 3173 return;
3169 3174
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after
4138 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4143 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4139 4144
4140 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4145 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4141 return false; 4146 return false;
4142 4147
4143 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4148 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4144 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4149 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4145 } 4150 }
4146 4151
4147 } // namespace blink 4152 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698