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

Side by Side Diff: Source/core/page/scrolling/ScrollingCoordinator.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 24 matching lines...) Expand all
35 #include "core/html/HTMLElement.h" 35 #include "core/html/HTMLElement.h"
36 #include "core/frame/FrameView.h" 36 #include "core/frame/FrameView.h"
37 #include "core/frame/LocalFrame.h" 37 #include "core/frame/LocalFrame.h"
38 #include "core/frame/Settings.h" 38 #include "core/frame/Settings.h"
39 #include "core/page/Page.h" 39 #include "core/page/Page.h"
40 #include "core/plugins/PluginView.h" 40 #include "core/plugins/PluginView.h"
41 #include "core/rendering/RenderGeometryMap.h" 41 #include "core/rendering/RenderGeometryMap.h"
42 #include "core/rendering/RenderView.h" 42 #include "core/rendering/RenderView.h"
43 #include "core/rendering/compositing/CompositedLayerMapping.h" 43 #include "core/rendering/compositing/CompositedLayerMapping.h"
44 #include "core/rendering/compositing/RenderLayerCompositor.h" 44 #include "core/rendering/compositing/RenderLayerCompositor.h"
45 #include "platform/TraceEvent.h"
46 #include "platform/exported/WebScrollbarImpl.h" 45 #include "platform/exported/WebScrollbarImpl.h"
47 #include "platform/exported/WebScrollbarThemeGeometryNative.h" 46 #include "platform/exported/WebScrollbarThemeGeometryNative.h"
48 #include "platform/geometry/Region.h" 47 #include "platform/geometry/Region.h"
49 #include "platform/geometry/TransformState.h" 48 #include "platform/geometry/TransformState.h"
50 #include "platform/graphics/GraphicsLayer.h" 49 #include "platform/graphics/GraphicsLayer.h"
51 #if OS(MACOSX) 50 #if OS(MACOSX)
52 #include "platform/mac/ScrollAnimatorMac.h" 51 #include "platform/mac/ScrollAnimatorMac.h"
53 #endif 52 #endif
54 #include "platform/scroll/ScrollAnimator.h" 53 #include "platform/scroll/ScrollAnimator.h"
55 #include "platform/scroll/ScrollbarTheme.h" 54 #include "platform/scroll/ScrollbarTheme.h"
56 #include "public/platform/Platform.h" 55 #include "public/platform/Platform.h"
57 #include "public/platform/WebCompositorSupport.h" 56 #include "public/platform/WebCompositorSupport.h"
58 #include "public/platform/WebLayerPositionConstraint.h" 57 #include "public/platform/WebLayerPositionConstraint.h"
59 #include "public/platform/WebScrollbarLayer.h" 58 #include "public/platform/WebScrollbarLayer.h"
60 #include "public/platform/WebScrollbarThemeGeometry.h" 59 #include "public/platform/WebScrollbarThemeGeometry.h"
61 #include "public/platform/WebScrollbarThemePainter.h" 60 #include "public/platform/WebScrollbarThemePainter.h"
61 #include "wtf/TraceEvent.h"
62 #include "wtf/text/StringBuilder.h" 62 #include "wtf/text/StringBuilder.h"
63 63
64 using blink::WebLayer; 64 using blink::WebLayer;
65 using blink::WebLayerPositionConstraint; 65 using blink::WebLayerPositionConstraint;
66 using blink::WebRect; 66 using blink::WebRect;
67 using blink::WebScrollbarLayer; 67 using blink::WebScrollbarLayer;
68 using blink::WebVector; 68 using blink::WebVector;
69 69
70 namespace { 70 namespace {
71 71
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 bool frameIsScrollable = frameView && frameView->isScrollable(); 951 bool frameIsScrollable = frameView && frameView->isScrollable();
952 if (frameIsScrollable != m_wasFrameScrollable) 952 if (frameIsScrollable != m_wasFrameScrollable)
953 return true; 953 return true;
954 954
955 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll ing()) : 0) 955 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll ing()) : 0)
956 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds( ); 956 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds( );
957 return false; 957 return false;
958 } 958 }
959 959
960 } // namespace WebCore 960 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698