OLD | NEW |
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 3202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3213 break; | 3213 break; |
3214 default: | 3214 default: |
3215 ASSERT_NOT_REACHED(); | 3215 ASSERT_NOT_REACHED(); |
3216 } | 3216 } |
3217 } | 3217 } |
3218 } | 3218 } |
3219 } | 3219 } |
3220 | 3220 |
3221 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) | 3221 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) |
3222 { | 3222 { |
| 3223 return coreHitTestResultAt(point); |
| 3224 } |
| 3225 |
| 3226 HitTestResult WebViewImpl::coreHitTestResultAt(const WebPoint& point) |
| 3227 { |
3223 IntPoint scaledPoint = point; | 3228 IntPoint scaledPoint = point; |
3224 scaledPoint.scale(1 / pageScaleFactor(), 1 / pageScaleFactor()); | 3229 scaledPoint.scale(1 / pageScaleFactor(), 1 / pageScaleFactor()); |
3225 return hitTestResultForWindowPos(scaledPoint); | 3230 return hitTestResultForWindowPos(scaledPoint); |
3226 } | 3231 } |
3227 | 3232 |
3228 void WebViewImpl::copyImageAt(const WebPoint& point) | 3233 void WebViewImpl::copyImageAt(const WebPoint& point) |
3229 { | 3234 { |
3230 if (!m_page) | 3235 if (!m_page) |
3231 return; | 3236 return; |
3232 | 3237 |
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4235 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4240 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4236 | 4241 |
4237 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4242 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4238 return false; | 4243 return false; |
4239 | 4244 |
4240 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4245 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4241 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4246 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4242 } | 4247 } |
4243 | 4248 |
4244 } // namespace blink | 4249 } // namespace blink |
OLD | NEW |