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

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

Issue 208263004: Move TraceEvent.h from platform/ to wtf/ Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 #include "platform/ContextMenuItem.h" 126 #include "platform/ContextMenuItem.h"
127 #include "platform/Cursor.h" 127 #include "platform/Cursor.h"
128 #include "platform/KeyboardCodes.h" 128 #include "platform/KeyboardCodes.h"
129 #include "platform/NotImplemented.h" 129 #include "platform/NotImplemented.h"
130 #include "platform/OverscrollTheme.h" 130 #include "platform/OverscrollTheme.h"
131 #include "platform/PlatformGestureEvent.h" 131 #include "platform/PlatformGestureEvent.h"
132 #include "platform/PlatformKeyboardEvent.h" 132 #include "platform/PlatformKeyboardEvent.h"
133 #include "platform/PlatformMouseEvent.h" 133 #include "platform/PlatformMouseEvent.h"
134 #include "platform/PlatformWheelEvent.h" 134 #include "platform/PlatformWheelEvent.h"
135 #include "platform/PopupMenuClient.h" 135 #include "platform/PopupMenuClient.h"
136 #include "platform/TraceEvent.h"
137 #include "platform/exported/WebActiveGestureAnimation.h" 136 #include "platform/exported/WebActiveGestureAnimation.h"
138 #include "platform/fonts/FontCache.h" 137 #include "platform/fonts/FontCache.h"
139 #include "platform/graphics/Color.h" 138 #include "platform/graphics/Color.h"
140 #include "platform/graphics/Image.h" 139 #include "platform/graphics/Image.h"
141 #include "platform/graphics/ImageBuffer.h" 140 #include "platform/graphics/ImageBuffer.h"
142 #include "platform/scroll/ScrollbarTheme.h" 141 #include "platform/scroll/ScrollbarTheme.h"
143 #include "platform/weborigin/SchemeRegistry.h" 142 #include "platform/weborigin/SchemeRegistry.h"
144 #include "public/platform/Platform.h" 143 #include "public/platform/Platform.h"
145 #include "public/platform/WebDragData.h" 144 #include "public/platform/WebDragData.h"
146 #include "public/platform/WebFloatPoint.h" 145 #include "public/platform/WebFloatPoint.h"
147 #include "public/platform/WebGestureCurve.h" 146 #include "public/platform/WebGestureCurve.h"
148 #include "public/platform/WebImage.h" 147 #include "public/platform/WebImage.h"
149 #include "public/platform/WebLayerTreeView.h" 148 #include "public/platform/WebLayerTreeView.h"
150 #include "public/platform/WebVector.h" 149 #include "public/platform/WebVector.h"
151 #include "wtf/CurrentTime.h" 150 #include "wtf/CurrentTime.h"
152 #include "wtf/RefPtr.h" 151 #include "wtf/RefPtr.h"
153 #include "wtf/TemporaryChange.h" 152 #include "wtf/TemporaryChange.h"
153 #include "wtf/TraceEvent.h"
154 154
155 #if USE(DEFAULT_RENDER_THEME) 155 #if USE(DEFAULT_RENDER_THEME)
156 #include "core/rendering/RenderThemeChromiumDefault.h" 156 #include "core/rendering/RenderThemeChromiumDefault.h"
157 #endif 157 #endif
158 158
159 // Get rid of WTF's pow define so we can use std::pow. 159 // Get rid of WTF's pow define so we can use std::pow.
160 #undef pow 160 #undef pow
161 #include <cmath> // for std::pow 161 #include <cmath> // for std::pow
162 162
163 using namespace WebCore; 163 using namespace WebCore;
(...skipping 3834 matching lines...) Expand 10 before | Expand all | Expand 10 after
3998 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3998 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3999 3999
4000 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4000 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4001 return false; 4001 return false;
4002 4002
4003 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4003 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4004 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4004 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4005 } 4005 }
4006 4006
4007 } // namespace blink 4007 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698