| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 #include "platform/UserGestureIndicator.h" | 107 #include "platform/UserGestureIndicator.h" |
| 108 #include "platform/exported/WebActiveGestureAnimation.h" | 108 #include "platform/exported/WebActiveGestureAnimation.h" |
| 109 #include "platform/fonts/FontCache.h" | 109 #include "platform/fonts/FontCache.h" |
| 110 #include "platform/graphics/Color.h" | 110 #include "platform/graphics/Color.h" |
| 111 #include "platform/graphics/Image.h" | 111 #include "platform/graphics/Image.h" |
| 112 #include "platform/graphics/ImageBuffer.h" | 112 #include "platform/graphics/ImageBuffer.h" |
| 113 #include "platform/scheduler/Scheduler.h" | 113 #include "platform/scheduler/Scheduler.h" |
| 114 #include "platform/scroll/ScrollbarTheme.h" | 114 #include "platform/scroll/ScrollbarTheme.h" |
| 115 #include "platform/weborigin/SchemeRegistry.h" | 115 #include "platform/weborigin/SchemeRegistry.h" |
| 116 #include "public/platform/Platform.h" | 116 #include "public/platform/Platform.h" |
| 117 #include "public/platform/WebBeginFrameArgs.h" |
| 117 #include "public/platform/WebDragData.h" | 118 #include "public/platform/WebDragData.h" |
| 118 #include "public/platform/WebFloatPoint.h" | 119 #include "public/platform/WebFloatPoint.h" |
| 119 #include "public/platform/WebGestureCurve.h" | 120 #include "public/platform/WebGestureCurve.h" |
| 120 #include "public/platform/WebImage.h" | 121 #include "public/platform/WebImage.h" |
| 121 #include "public/platform/WebLayerTreeView.h" | 122 #include "public/platform/WebLayerTreeView.h" |
| 122 #include "public/platform/WebURLRequest.h" | 123 #include "public/platform/WebURLRequest.h" |
| 123 #include "public/platform/WebVector.h" | 124 #include "public/platform/WebVector.h" |
| 124 #include "public/web/WebAXObject.h" | 125 #include "public/web/WebAXObject.h" |
| 125 #include "public/web/WebActiveWheelFlingParameters.h" | 126 #include "public/web/WebActiveWheelFlingParameters.h" |
| 126 #include "public/web/WebAutofillClient.h" | 127 #include "public/web/WebAutofillClient.h" |
| 127 #include "public/web/WebBeginFrameArgs.h" | |
| 128 #include "public/web/WebFrameClient.h" | 128 #include "public/web/WebFrameClient.h" |
| 129 #include "public/web/WebHitTestResult.h" | 129 #include "public/web/WebHitTestResult.h" |
| 130 #include "public/web/WebInputElement.h" | 130 #include "public/web/WebInputElement.h" |
| 131 #include "public/web/WebMediaPlayerAction.h" | 131 #include "public/web/WebMediaPlayerAction.h" |
| 132 #include "public/web/WebNode.h" | 132 #include "public/web/WebNode.h" |
| 133 #include "public/web/WebPlugin.h" | 133 #include "public/web/WebPlugin.h" |
| 134 #include "public/web/WebPluginAction.h" | 134 #include "public/web/WebPluginAction.h" |
| 135 #include "public/web/WebRange.h" | 135 #include "public/web/WebRange.h" |
| 136 #include "public/web/WebTextInputInfo.h" | 136 #include "public/web/WebTextInputInfo.h" |
| 137 #include "public/web/WebViewClient.h" | 137 #include "public/web/WebViewClient.h" |
| (...skipping 4140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4278 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4278 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4279 | 4279 |
| 4280 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4280 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4281 return false; | 4281 return false; |
| 4282 | 4282 |
| 4283 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4283 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4284 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4284 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4285 } | 4285 } |
| 4286 | 4286 |
| 4287 } // namespace blink | 4287 } // namespace blink |
| OLD | NEW |