| 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 "core/page/FrameTree.h" | 107 #include "core/page/FrameTree.h" | 
| 108 #include "core/frame/FrameView.h" | 108 #include "core/frame/FrameView.h" | 
| 109 #include "core/page/Page.h" | 109 #include "core/page/Page.h" | 
| 110 #include "core/page/PageGroup.h" | 110 #include "core/page/PageGroup.h" | 
| 111 #include "core/page/PageGroupLoadDeferrer.h" | 111 #include "core/page/PageGroupLoadDeferrer.h" | 
| 112 #include "core/page/PagePopupClient.h" | 112 #include "core/page/PagePopupClient.h" | 
| 113 #include "core/page/PointerLockController.h" | 113 #include "core/page/PointerLockController.h" | 
| 114 #include "core/frame/Settings.h" | 114 #include "core/frame/Settings.h" | 
| 115 #include "core/page/TouchDisambiguation.h" | 115 #include "core/page/TouchDisambiguation.h" | 
| 116 #include "core/platform/chromium/ChromiumDataObject.h" | 116 #include "core/platform/chromium/ChromiumDataObject.h" | 
| 117 #include "core/platform/chromium/KeyboardCodes.h" |  | 
| 118 #include "core/rendering/RenderLayerCompositor.h" | 117 #include "core/rendering/RenderLayerCompositor.h" | 
| 119 #include "core/rendering/RenderView.h" | 118 #include "core/rendering/RenderView.h" | 
| 120 #include "core/rendering/RenderWidget.h" | 119 #include "core/rendering/RenderWidget.h" | 
| 121 #include "core/rendering/TextAutosizer.h" | 120 #include "core/rendering/TextAutosizer.h" | 
| 122 #include "modules/geolocation/GeolocationController.h" | 121 #include "modules/geolocation/GeolocationController.h" | 
| 123 #include "modules/notifications/NotificationController.h" | 122 #include "modules/notifications/NotificationController.h" | 
| 124 #include "painting/ContinuousPainter.h" | 123 #include "painting/ContinuousPainter.h" | 
| 125 #include "platform/ContextMenu.h" | 124 #include "platform/ContextMenu.h" | 
| 126 #include "platform/ContextMenuItem.h" | 125 #include "platform/ContextMenuItem.h" | 
| 127 #include "platform/Cursor.h" | 126 #include "platform/Cursor.h" | 
|  | 127 #include "platform/KeyboardCodes.h" | 
| 128 #include "platform/NotImplemented.h" | 128 #include "platform/NotImplemented.h" | 
| 129 #include "platform/OverscrollTheme.h" | 129 #include "platform/OverscrollTheme.h" | 
| 130 #include "platform/PlatformGestureEvent.h" | 130 #include "platform/PlatformGestureEvent.h" | 
| 131 #include "platform/PlatformKeyboardEvent.h" | 131 #include "platform/PlatformKeyboardEvent.h" | 
| 132 #include "platform/PlatformMouseEvent.h" | 132 #include "platform/PlatformMouseEvent.h" | 
| 133 #include "platform/PlatformWheelEvent.h" | 133 #include "platform/PlatformWheelEvent.h" | 
| 134 #include "platform/PopupMenuClient.h" | 134 #include "platform/PopupMenuClient.h" | 
| 135 #include "platform/TraceEvent.h" | 135 #include "platform/TraceEvent.h" | 
| 136 #include "platform/exported/WebActiveGestureAnimation.h" | 136 #include "platform/exported/WebActiveGestureAnimation.h" | 
| 137 #include "platform/fonts/FontCache.h" | 137 #include "platform/fonts/FontCache.h" | 
| (...skipping 4057 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4195     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
      nedConstraints(); | 4195     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
      nedConstraints(); | 
| 4196 | 4196 | 
| 4197     if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4197     if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 
| 4198         return false; | 4198         return false; | 
| 4199 | 4199 | 
| 4200     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4200     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 
| 4201         || (constraints.minimumScale == constraints.maximumScale && constraints.
      minimumScale != -1); | 4201         || (constraints.minimumScale == constraints.maximumScale && constraints.
      minimumScale != -1); | 
| 4202 } | 4202 } | 
| 4203 | 4203 | 
| 4204 } // namespace blink | 4204 } // namespace blink | 
| OLD | NEW | 
|---|