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