| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   113 #include "core/page/Settings.h" |   113 #include "core/page/Settings.h" | 
|   114 #include "core/page/TouchDisambiguation.h" |   114 #include "core/page/TouchDisambiguation.h" | 
|   115 #include "core/platform/ContextMenu.h" |   115 #include "core/platform/ContextMenu.h" | 
|   116 #include "core/platform/ContextMenuItem.h" |   116 #include "core/platform/ContextMenuItem.h" | 
|   117 #include "core/platform/Cursor.h" |   117 #include "core/platform/Cursor.h" | 
|   118 #include "core/platform/DragData.h" |   118 #include "core/platform/DragData.h" | 
|   119 #include "core/platform/OverscrollTheme.h" |   119 #include "core/platform/OverscrollTheme.h" | 
|   120 #include "core/platform/PopupMenuClient.h" |   120 #include "core/platform/PopupMenuClient.h" | 
|   121 #include "core/platform/ScrollbarTheme.h" |   121 #include "core/platform/ScrollbarTheme.h" | 
|   122 #include "core/platform/chromium/ChromiumDataObject.h" |   122 #include "core/platform/chromium/ChromiumDataObject.h" | 
|   123 #include "core/platform/chromium/KeyboardCodes.h" |  | 
|   124 #include "core/platform/graphics/FontCache.h" |   123 #include "core/platform/graphics/FontCache.h" | 
|   125 #include "core/platform/graphics/Image.h" |   124 #include "core/platform/graphics/Image.h" | 
|   126 #include "core/platform/graphics/ImageBuffer.h" |   125 #include "core/platform/graphics/ImageBuffer.h" | 
|   127 #include "core/platform/graphics/chromium/LayerPainterChromium.h" |   126 #include "core/platform/graphics/chromium/LayerPainterChromium.h" | 
|   128 #include "core/rendering/RenderLayerCompositor.h" |   127 #include "core/rendering/RenderLayerCompositor.h" | 
|   129 #include "core/rendering/RenderView.h" |   128 #include "core/rendering/RenderView.h" | 
|   130 #include "core/rendering/RenderWidget.h" |   129 #include "core/rendering/RenderWidget.h" | 
|   131 #include "core/rendering/TextAutosizer.h" |   130 #include "core/rendering/TextAutosizer.h" | 
|   132 #include "modules/geolocation/GeolocationController.h" |   131 #include "modules/geolocation/GeolocationController.h" | 
|   133 #include "painting/ContinuousPainter.h" |   132 #include "painting/ContinuousPainter.h" | 
 |   133 #include "platform/KeyboardCodes.h" | 
|   134 #include "platform/NotImplemented.h" |   134 #include "platform/NotImplemented.h" | 
|   135 #include "platform/PlatformGestureEvent.h" |   135 #include "platform/PlatformGestureEvent.h" | 
|   136 #include "platform/PlatformKeyboardEvent.h" |   136 #include "platform/PlatformKeyboardEvent.h" | 
|   137 #include "platform/PlatformMouseEvent.h" |   137 #include "platform/PlatformMouseEvent.h" | 
|   138 #include "platform/PlatformWheelEvent.h" |   138 #include "platform/PlatformWheelEvent.h" | 
|   139 #include "platform/Timer.h" |   139 #include "platform/Timer.h" | 
|   140 #include "platform/TraceEvent.h" |   140 #include "platform/TraceEvent.h" | 
|   141 #include "platform/exported/WebActiveGestureAnimation.h" |   141 #include "platform/exported/WebActiveGestureAnimation.h" | 
|   142 #include "platform/graphics/Color.h" |   142 #include "platform/graphics/Color.h" | 
|   143 #include "public/platform/Platform.h" |   143 #include "public/platform/Platform.h" | 
| (...skipping 4033 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4177     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
      nedConstraints(); |  4177     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
      nedConstraints(); | 
|  4178  |  4178  | 
|  4179     if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |  4179     if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 
|  4180         return false; |  4180         return false; | 
|  4181  |  4181  | 
|  4182     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |  4182     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 
|  4183         || (constraints.minimumScale == constraints.maximumScale && constraints.
      minimumScale != -1); |  4183         || (constraints.minimumScale == constraints.maximumScale && constraints.
      minimumScale != -1); | 
|  4184 } |  4184 } | 
|  4185  |  4185  | 
|  4186 } // namespace WebKit |  4186 } // namespace WebKit | 
| OLD | NEW |