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 3138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3149 break; | 3149 break; |
3150 default: | 3150 default: |
3151 ASSERT_NOT_REACHED(); | 3151 ASSERT_NOT_REACHED(); |
3152 } | 3152 } |
3153 } | 3153 } |
3154 } | 3154 } |
3155 } | 3155 } |
3156 | 3156 |
3157 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) | 3157 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) |
3158 { | 3158 { |
| 3159 return coreHitTestResultAt(point); |
| 3160 } |
| 3161 |
| 3162 HitTestResult WebViewImpl::coreHitTestResultAt(const WebPoint& point) |
| 3163 { |
3159 IntPoint scaledPoint = point; | 3164 IntPoint scaledPoint = point; |
3160 scaledPoint.scale(1 / pageScaleFactor(), 1 / pageScaleFactor()); | 3165 scaledPoint.scale(1 / pageScaleFactor(), 1 / pageScaleFactor()); |
3161 return hitTestResultForWindowPos(scaledPoint); | 3166 return hitTestResultForWindowPos(scaledPoint); |
3162 } | 3167 } |
3163 | 3168 |
3164 void WebViewImpl::copyImageAt(const WebPoint& point) | 3169 void WebViewImpl::copyImageAt(const WebPoint& point) |
3165 { | 3170 { |
3166 if (!m_page) | 3171 if (!m_page) |
3167 return; | 3172 return; |
3168 | 3173 |
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4137 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4142 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4138 | 4143 |
4139 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4144 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4140 return false; | 4145 return false; |
4141 | 4146 |
4142 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4147 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4143 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4148 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4144 } | 4149 } |
4145 | 4150 |
4146 } // namespace blink | 4151 } // namespace blink |
OLD | NEW |