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

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

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi Created 7 years, 1 month 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/WebUserMediaRequest.cpp ('k') | Source/web/tests/FrameLoaderClientImplTest.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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 #include "modules/geolocation/GeolocationController.h" 130 #include "modules/geolocation/GeolocationController.h"
131 #include "painting/ContinuousPainter.h" 131 #include "painting/ContinuousPainter.h"
132 #include "platform/NotImplemented.h" 132 #include "platform/NotImplemented.h"
133 #include "platform/PlatformGestureEvent.h" 133 #include "platform/PlatformGestureEvent.h"
134 #include "platform/PlatformKeyboardEvent.h" 134 #include "platform/PlatformKeyboardEvent.h"
135 #include "platform/PlatformMouseEvent.h" 135 #include "platform/PlatformMouseEvent.h"
136 #include "platform/PlatformWheelEvent.h" 136 #include "platform/PlatformWheelEvent.h"
137 #include "platform/TraceEvent.h" 137 #include "platform/TraceEvent.h"
138 #include "platform/exported/WebActiveGestureAnimation.h" 138 #include "platform/exported/WebActiveGestureAnimation.h"
139 #include "platform/graphics/Color.h" 139 #include "platform/graphics/Color.h"
140 #include "platform/weborigin/SchemeRegistry.h"
140 #include "public/platform/Platform.h" 141 #include "public/platform/Platform.h"
141 #include "public/platform/WebDragData.h" 142 #include "public/platform/WebDragData.h"
142 #include "public/platform/WebFloatPoint.h" 143 #include "public/platform/WebFloatPoint.h"
143 #include "public/platform/WebGestureCurve.h" 144 #include "public/platform/WebGestureCurve.h"
144 #include "public/platform/WebImage.h" 145 #include "public/platform/WebImage.h"
145 #include "public/platform/WebLayerTreeView.h" 146 #include "public/platform/WebLayerTreeView.h"
146 #include "public/platform/WebVector.h" 147 #include "public/platform/WebVector.h"
147 #include "weborigin/SchemeRegistry.h"
148 #include "wtf/CurrentTime.h" 148 #include "wtf/CurrentTime.h"
149 #include "wtf/RefPtr.h" 149 #include "wtf/RefPtr.h"
150 #include "wtf/TemporaryChange.h" 150 #include "wtf/TemporaryChange.h"
151 151
152 #if USE(DEFAULT_RENDER_THEME) 152 #if USE(DEFAULT_RENDER_THEME)
153 #include "core/rendering/RenderThemeChromiumDefault.h" 153 #include "core/rendering/RenderThemeChromiumDefault.h"
154 #endif 154 #endif
155 155
156 #if OS(WIN) 156 #if OS(WIN)
157 #if !USE(DEFAULT_RENDER_THEME) 157 #if !USE(DEFAULT_RENDER_THEME)
(...skipping 4022 matching lines...) Expand 10 before | Expand all | Expand 10 after
4180 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4180 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4181 4181
4182 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4182 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4183 return false; 4183 return false;
4184 4184
4185 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4185 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4186 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4186 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4187 } 4187 }
4188 4188
4189 } // namespace blink 4189 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebUserMediaRequest.cpp ('k') | Source/web/tests/FrameLoaderClientImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698