Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 25195003: Prepare to move core/platform/text into blink_platform.dll (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-attempt upload Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/WebPopupMenuImpl.cpp ('k') | Source/web/tests/LocaleMacTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #include "core/page/PageGroupLoadDeferrer.h" 127 #include "core/page/PageGroupLoadDeferrer.h"
128 #include "core/page/PagePopupClient.h" 128 #include "core/page/PagePopupClient.h"
129 #include "core/page/PointerLockController.h" 129 #include "core/page/PointerLockController.h"
130 #include "core/page/Settings.h" 130 #include "core/page/Settings.h"
131 #include "core/page/TouchDisambiguation.h" 131 #include "core/page/TouchDisambiguation.h"
132 #include "core/platform/ContextMenu.h" 132 #include "core/platform/ContextMenu.h"
133 #include "core/platform/ContextMenuItem.h" 133 #include "core/platform/ContextMenuItem.h"
134 #include "core/platform/Cursor.h" 134 #include "core/platform/Cursor.h"
135 #include "core/platform/DragData.h" 135 #include "core/platform/DragData.h"
136 #include "core/platform/MIMETypeRegistry.h" 136 #include "core/platform/MIMETypeRegistry.h"
137 #include "core/platform/NotImplemented.h" 137 #include "platform/NotImplemented.h"
138 #include "core/platform/PlatformGestureEvent.h" 138 #include "core/platform/PlatformGestureEvent.h"
139 #include "core/platform/PlatformKeyboardEvent.h" 139 #include "core/platform/PlatformKeyboardEvent.h"
140 #include "core/platform/PlatformMouseEvent.h" 140 #include "core/platform/PlatformMouseEvent.h"
141 #include "core/platform/PlatformWheelEvent.h" 141 #include "core/platform/PlatformWheelEvent.h"
142 #include "core/platform/PopupMenuClient.h" 142 #include "core/platform/PopupMenuClient.h"
143 #include "core/platform/Timer.h" 143 #include "core/platform/Timer.h"
144 #include "core/platform/chromium/ChromiumDataObject.h" 144 #include "core/platform/chromium/ChromiumDataObject.h"
145 #include "core/platform/chromium/KeyboardCodes.h" 145 #include "core/platform/chromium/KeyboardCodes.h"
146 #include "core/platform/chromium/TraceEvent.h" 146 #include "core/platform/chromium/TraceEvent.h"
147 #include "core/platform/chromium/support/WebActiveGestureAnimation.h" 147 #include "core/platform/chromium/support/WebActiveGestureAnimation.h"
(...skipping 4048 matching lines...) Expand 10 before | Expand all | Expand 10 after
4196 // the initial viewport width. 4196 // the initial viewport width.
4197 // 2. The author has disabled viewport zoom. 4197 // 2. The author has disabled viewport zoom.
4198 4198
4199 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4199 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4200 4200
4201 return fixedLayoutSize().width == m_size.width 4201 return fixedLayoutSize().width == m_size.width
4202 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4202 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4203 } 4203 }
4204 4204
4205 } // namespace WebKit 4205 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/WebPopupMenuImpl.cpp ('k') | Source/web/tests/LocaleMacTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698