| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 #include "public/platform/WebDragData.h" | 144 #include "public/platform/WebDragData.h" |
| 145 #include "public/platform/WebFloatPoint.h" | 145 #include "public/platform/WebFloatPoint.h" |
| 146 #include "public/platform/WebGestureCurve.h" | 146 #include "public/platform/WebGestureCurve.h" |
| 147 #include "public/platform/WebImage.h" | 147 #include "public/platform/WebImage.h" |
| 148 #include "public/platform/WebLayer.h" | 148 #include "public/platform/WebLayer.h" |
| 149 #include "public/platform/WebLayerTreeView.h" | 149 #include "public/platform/WebLayerTreeView.h" |
| 150 #include "public/platform/WebPoint.h" | 150 #include "public/platform/WebPoint.h" |
| 151 #include "public/platform/WebRect.h" | 151 #include "public/platform/WebRect.h" |
| 152 #include "public/platform/WebString.h" | 152 #include "public/platform/WebString.h" |
| 153 #include "public/platform/WebVector.h" | 153 #include "public/platform/WebVector.h" |
| 154 #include "weborigin/SchemeRegistry.h" | 154 #include "platform/weborigin/SchemeRegistry.h" |
| 155 #include "wtf/CurrentTime.h" | 155 #include "wtf/CurrentTime.h" |
| 156 #include "wtf/RefPtr.h" | 156 #include "wtf/RefPtr.h" |
| 157 #include "wtf/TemporaryChange.h" | 157 #include "wtf/TemporaryChange.h" |
| 158 | 158 |
| 159 #if USE(DEFAULT_RENDER_THEME) | 159 #if USE(DEFAULT_RENDER_THEME) |
| 160 #include "core/rendering/RenderThemeChromiumDefault.h" | 160 #include "core/rendering/RenderThemeChromiumDefault.h" |
| 161 #endif | 161 #endif |
| 162 | 162 |
| 163 #if OS(WIN) | 163 #if OS(WIN) |
| 164 #if !USE(DEFAULT_RENDER_THEME) | 164 #if !USE(DEFAULT_RENDER_THEME) |
| (...skipping 4012 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 |