| 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 4107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4118 void WebViewImpl::didChangeContentsSize() | 4118 void WebViewImpl::didChangeContentsSize() |
| 4119 { | 4119 { |
| 4120 m_pageScaleConstraintsSet.didChangeContentsSize(contentsSize(), pageScaleFac
tor()); | 4120 m_pageScaleConstraintsSet.didChangeContentsSize(contentsSize(), pageScaleFac
tor()); |
| 4121 } | 4121 } |
| 4122 | 4122 |
| 4123 void WebViewImpl::pageScaleFactorChanged() | 4123 void WebViewImpl::pageScaleFactorChanged() |
| 4124 { | 4124 { |
| 4125 m_pageScaleConstraintsSet.setNeedsReset(false); | 4125 m_pageScaleConstraintsSet.setNeedsReset(false); |
| 4126 updateLayerTreeViewport(); | 4126 updateLayerTreeViewport(); |
| 4127 m_page->inspectorController().pageScaleFactorChanged(); | 4127 m_page->inspectorController().pageScaleFactorChanged(); |
| 4128 m_client->pageScaleFactorChanged(); |
| 4128 } | 4129 } |
| 4129 | 4130 |
| 4130 bool WebViewImpl::useExternalPopupMenus() | 4131 bool WebViewImpl::useExternalPopupMenus() |
| 4131 { | 4132 { |
| 4132 return shouldUseExternalPopupMenus; | 4133 return shouldUseExternalPopupMenus; |
| 4133 } | 4134 } |
| 4134 | 4135 |
| 4135 void WebViewImpl::startDragging(LocalFrame* frame, | 4136 void WebViewImpl::startDragging(LocalFrame* frame, |
| 4136 const WebDragData& dragData, | 4137 const WebDragData& dragData, |
| 4137 WebDragOperationsMask mask, | 4138 WebDragOperationsMask mask, |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4671 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4672 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4672 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4673 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4673 } | 4674 } |
| 4674 | 4675 |
| 4675 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4676 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4676 { | 4677 { |
| 4677 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4678 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4678 } | 4679 } |
| 4679 | 4680 |
| 4680 } // namespace blink | 4681 } // namespace blink |
| OLD | NEW |