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 3458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3469 } | 3469 } |
3470 if (m_pageOverlays) | 3470 if (m_pageOverlays) |
3471 m_pageOverlays->update(); | 3471 m_pageOverlays->update(); |
3472 } | 3472 } |
3473 | 3473 |
3474 void WebViewImpl::configureAutoResizeMode() | 3474 void WebViewImpl::configureAutoResizeMode() |
3475 { | 3475 { |
3476 if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame
()->view()) | 3476 if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame
()->view()) |
3477 return; | 3477 return; |
3478 | 3478 |
3479 mainFrameImpl()->frame()->view()->enableAutoSizeMode(m_shouldAutoResize, m_m
inAutoSize, m_maxAutoSize); | 3479 if (m_shouldAutoResize) |
| 3480 mainFrameImpl()->frame()->view()->enableAutoSizeMode(m_minAutoSize, m_ma
xAutoSize); |
| 3481 else |
| 3482 mainFrameImpl()->frame()->view()->disableAutoSizeMode(); |
3480 } | 3483 } |
3481 | 3484 |
3482 unsigned long WebViewImpl::createUniqueIdentifierForRequest() | 3485 unsigned long WebViewImpl::createUniqueIdentifierForRequest() |
3483 { | 3486 { |
3484 return createUniqueIdentifier(); | 3487 return createUniqueIdentifier(); |
3485 } | 3488 } |
3486 | 3489 |
3487 void WebViewImpl::inspectElementAt(const WebPoint& point) | 3490 void WebViewImpl::inspectElementAt(const WebPoint& point) |
3488 { | 3491 { |
3489 if (!m_page) | 3492 if (!m_page) |
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4258 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4261 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4259 | 4262 |
4260 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4263 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4261 return false; | 4264 return false; |
4262 | 4265 |
4263 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4266 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4264 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4267 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4265 } | 4268 } |
4266 | 4269 |
4267 } // namespace blink | 4270 } // namespace blink |
OLD | NEW |