diff options
200 files changed, 35 insertions, 437 deletions
@@ -5,9 +5,6 @@ include_rules = [ "+third_party/khronos/GLES2/gl2ext.h", "+ui/gfx", "+media", -# http://crbug.com/154451 - "+third_party/WebKit/Source/WTF/config.h", - "+Source/WTF/config.h", # TODO(piman): Remove as soon as ui/compositor uses cc directly. # http://crbug.com/159278 "+third_party/WebKit/Source/Platform/chromium/public/WebCompositorTransferableResourceList.h" diff --git a/cc/active_animation.cc b/cc/active_animation.cc index 43f3a01..bdc2c8d 100644 --- a/cc/active_animation.cc +++ b/cc/active_animation.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/active_animation.h" #include <cmath> diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc index f9b8fcf..a24218c 100644 --- a/cc/active_animation_unittest.cc +++ b/cc/active_animation_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/active_animation.h" #include "cc/test/animation_test_common.h" diff --git a/cc/animation_curve.cc b/cc/animation_curve.cc index de8be1b..73c5291 100644 --- a/cc/animation_curve.cc +++ b/cc/animation_curve.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/animation_curve.h" #include "base/logging.h" diff --git a/cc/bitmap_content_layer_updater.cc b/cc/bitmap_content_layer_updater.cc index ffb1165d..5200573 100644 --- a/cc/bitmap_content_layer_updater.cc +++ b/cc/bitmap_content_layer_updater.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/bitmap_content_layer_updater.h" #include "cc/layer_painter.h" diff --git a/cc/bitmap_skpicture_content_layer_updater.cc b/cc/bitmap_skpicture_content_layer_updater.cc index ce739de..54d04fb 100644 --- a/cc/bitmap_skpicture_content_layer_updater.cc +++ b/cc/bitmap_skpicture_content_layer_updater.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/bitmap_skpicture_content_layer_updater.h" #include "base/time.h" diff --git a/cc/caching_bitmap_content_layer_updater.cc b/cc/caching_bitmap_content_layer_updater.cc index 3c538b8..ddeef24 100644 --- a/cc/caching_bitmap_content_layer_updater.cc +++ b/cc/caching_bitmap_content_layer_updater.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "caching_bitmap_content_layer_updater.h" #include "cc/layer_painter.h" @@ -265,9 +265,6 @@ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', - '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf', - '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'defines': [ @@ -279,7 +276,6 @@ ], 'sources': [ '<@(cc_source_files)', - 'stubs/config.h', ], }, ], @@ -16,10 +16,9 @@ 'webkit_src_dir': '<(webkit_src_dir)', 'conditions': [ ['inside_chromium_build==1', { - 'cc_stubs_dirs': ['stubs'], + 'cc_stubs_dirs': [], }, { 'cc_stubs_dirs': [ - 'stubs', '<(SHARED_INTERMEDIATE_DIR)/webkit', '<(webkit_src_dir)', '<(webkit_src_dir)/Source/WebCore/platform', diff --git a/cc/checkerboard_draw_quad.cc b/cc/checkerboard_draw_quad.cc index 6956494..a553ccf 100644 --- a/cc/checkerboard_draw_quad.cc +++ b/cc/checkerboard_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/checkerboard_draw_quad.h" #include "base/logging.h" diff --git a/cc/content_layer.cc b/cc/content_layer.cc index 62f3221..5f46896 100644 --- a/cc/content_layer.cc +++ b/cc/content_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/content_layer.h" #include "base/metrics/histogram.h" diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc index cbd5dd4..2788129e 100644 --- a/cc/content_layer_unittest.cc +++ b/cc/content_layer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/content_layer.h" #include "cc/bitmap_content_layer_updater.h" diff --git a/cc/content_layer_updater.cc b/cc/content_layer_updater.cc index aba79ec0..ab7a382 100644 --- a/cc/content_layer_updater.cc +++ b/cc/content_layer_updater.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/content_layer_updater.h" #include "base/debug/trace_event.h" diff --git a/cc/contents_scaling_layer.cc b/cc/contents_scaling_layer.cc index 1b5443b..c0fb126 100644 --- a/cc/contents_scaling_layer.cc +++ b/cc/contents_scaling_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/contents_scaling_layer.h" #include "ui/gfx/size_conversions.h" diff --git a/cc/contents_scaling_layer_unittest.cc b/cc/contents_scaling_layer_unittest.cc index 45fbfb5..5699ada 100644 --- a/cc/contents_scaling_layer_unittest.cc +++ b/cc/contents_scaling_layer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/contents_scaling_layer.h" #include "cc/test/geometry_test_utils.h" diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc index bf545d0..e10461d 100644 --- a/cc/damage_tracker.cc +++ b/cc/damage_tracker.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/damage_tracker.h" #include "cc/layer_impl.h" @@ -343,4 +341,3 @@ void DamageTracker::extendDamageForRenderSurface(LayerImpl* layer, gfx::RectF& t } } // namespace cc - diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc index 8f741bc..23e0a15 100644 --- a/cc/damage_tracker_unittest.cc +++ b/cc/damage_tracker_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/damage_tracker.h" #include "cc/layer_impl.h" diff --git a/cc/debug_border_draw_quad.cc b/cc/debug_border_draw_quad.cc index 9f73ac6..dbcd93f 100644 --- a/cc/debug_border_draw_quad.cc +++ b/cc/debug_border_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/debug_border_draw_quad.h" #include "base/logging.h" diff --git a/cc/debug_rect_history.cc b/cc/debug_rect_history.cc index 293ea58..02ece2c 100644 --- a/cc/debug_rect_history.cc +++ b/cc/debug_rect_history.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/debug_rect_history.h" #include "cc/damage_tracker.h" diff --git a/cc/delay_based_time_source.cc b/cc/delay_based_time_source.cc index 0beb72b..2924065 100644 --- a/cc/delay_based_time_source.cc +++ b/cc/delay_based_time_source.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/delay_based_time_source.h" #include <algorithm> diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc index 3e824d6..af8139d 100644 --- a/cc/delay_based_time_source_unittest.cc +++ b/cc/delay_based_time_source_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/delay_based_time_source.h" #include "cc/test/scheduler_test_common.h" diff --git a/cc/delegated_renderer_layer.cc b/cc/delegated_renderer_layer.cc index 12eabe4..0fb1ada 100644 --- a/cc/delegated_renderer_layer.cc +++ b/cc/delegated_renderer_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/delegated_renderer_layer.h" #include "cc/delegated_renderer_layer_impl.h" diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc index 1c04e33..a740a1f 100644 --- a/cc/delegated_renderer_layer_impl.cc +++ b/cc/delegated_renderer_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/delegated_renderer_layer_impl.h" #include "cc/append_quads_data.h" diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc index 2290cd3..c7cebcc 100644 --- a/cc/delegated_renderer_layer_impl_unittest.cc +++ b/cc/delegated_renderer_layer_impl_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/delegated_renderer_layer_impl.h" #include "cc/append_quads_data.h" diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc index ee0e1c1..d4e0099 100644 --- a/cc/direct_renderer.cc +++ b/cc/direct_renderer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/direct_renderer.h" #include <vector> diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc index b3fd553..27e933b 100644 --- a/cc/draw_quad.cc +++ b/cc/draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/draw_quad.h" #include "base/logging.h" @@ -84,7 +82,7 @@ scoped_ptr<DrawQuad> DrawQuad::copy(const SharedQuadState* copiedSharedQuadState break; case RenderPass: // RenderPass quads have their own copy() method. case Invalid: - CRASH(); + LOG(FATAL) << "Invalid DrawQuad material " << material(); break; } copyQuad->setSharedQuadState(copiedSharedQuadState); diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc index a73bbec..12388c8 100644 --- a/cc/draw_quad_unittest.cc +++ b/cc/draw_quad_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/draw_quad.h" #include "cc/checkerboard_draw_quad.h" diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc index bfc1d6a..901022c 100644 --- a/cc/float_quad_unittest.cc +++ b/cc/float_quad_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/math_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect_f.h" diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc index 5cb2daf..aa464da 100644 --- a/cc/font_atlas.cc +++ b/cc/font_atlas.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/font_atlas.h" #include <vector> diff --git a/cc/frame_rate_controller.cc b/cc/frame_rate_controller.cc index 614ad71..e8f82de 100644 --- a/cc/frame_rate_controller.cc +++ b/cc/frame_rate_controller.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/frame_rate_controller.h" #include "base/debug/trace_event.h" diff --git a/cc/frame_rate_controller_unittest.cc b/cc/frame_rate_controller_unittest.cc index b639a1d..7a6b02b5 100644 --- a/cc/frame_rate_controller_unittest.cc +++ b/cc/frame_rate_controller_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/frame_rate_controller.h" #include "cc/test/scheduler_test_common.h" diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc index 2c39228..d84b744 100644 --- a/cc/frame_rate_counter.cc +++ b/cc/frame_rate_counter.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/frame_rate_counter.h" #include <cmath> diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc index 6a76ccc..3ccea1f 100644 --- a/cc/geometry_binding.cc +++ b/cc/geometry_binding.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/geometry_binding.h" #include "cc/gl_renderer.h" // For the GLC() macro. diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc index c9be888..dd46db2 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/gl_renderer.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/string_split.h" #include "base/string_util.h" +#include "build/build_config.h" #include "cc/damage_tracker.h" #include "cc/geometry_binding.h" #include "cc/layer_quad.h" @@ -53,7 +52,7 @@ namespace { bool needsIOSurfaceReadbackWorkaround() { -#if OS(DARWIN) +#if defined(OS_MACOSX) return true; #else return false; diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc index 5e1e978..f89af2f 100644 --- a/cc/gl_renderer_unittest.cc +++ b/cc/gl_renderer_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "cc/gl_renderer.h" #include "cc/draw_quad.h" diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc index 423e535..7cd8b4a 100644 --- a/cc/heads_up_display_layer.cc +++ b/cc/heads_up_display_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/heads_up_display_layer.h" #include "base/debug/trace_event.h" diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index 8aeb51d..17064c9 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/heads_up_display_layer_impl.h" #include "base/stringprintf.h" diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc index f93adaef..0c2ae76 100644 --- a/cc/heads_up_display_unittest.cc +++ b/cc/heads_up_display_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/heads_up_display_layer.h" #include "cc/layer.h" #include "cc/layer_tree_host.h" diff --git a/cc/image_layer.cc b/cc/image_layer.cc index c150c6d..f3819fa 100644 --- a/cc/image_layer.cc +++ b/cc/image_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/image_layer.h" #include "base/compiler_specific.h" diff --git a/cc/image_layer_updater.cc b/cc/image_layer_updater.cc index 40bf472..8f97359 100644 --- a/cc/image_layer_updater.cc +++ b/cc/image_layer_updater.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/image_layer_updater.h" #include "cc/resource_update_queue.h" diff --git a/cc/image_layer_updater.h b/cc/image_layer_updater.h index 3a70dd3..70474e9 100644 --- a/cc/image_layer_updater.h +++ b/cc/image_layer_updater.h @@ -5,8 +5,6 @@ #ifndef ImageLayerUpdater_h #define ImageLayerUpdater_h -#include "config.h" - #include "cc/layer_updater.h" namespace cc { diff --git a/cc/io_surface_draw_quad.cc b/cc/io_surface_draw_quad.cc index f1fd32f..3eb09a4 100644 --- a/cc/io_surface_draw_quad.cc +++ b/cc/io_surface_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/io_surface_draw_quad.h" #include "base/logging.h" diff --git a/cc/io_surface_layer.cc b/cc/io_surface_layer.cc index 38fbdf4..f2351c8 100644 --- a/cc/io_surface_layer.cc +++ b/cc/io_surface_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/io_surface_layer.h" #include "cc/io_surface_layer_impl.h" diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc index 28fb1bc..2e1ac61 100644 --- a/cc/io_surface_layer_impl.cc +++ b/cc/io_surface_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/io_surface_layer_impl.h" #include "base/stringprintf.h" diff --git a/cc/keyframed_animation_curve.cc b/cc/keyframed_animation_curve.cc index daf2457..9cf0ef3 100644 --- a/cc/keyframed_animation_curve.cc +++ b/cc/keyframed_animation_curve.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/keyframed_animation_curve.h" using WebKit::WebTransformationMatrix; diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/keyframed_animation_curve_unittest.cc index a1a0cf9..e4fd93f 100644 --- a/cc/keyframed_animation_curve_unittest.cc +++ b/cc/keyframed_animation_curve_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/keyframed_animation_curve.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/cc/layer.cc b/cc/layer.cc index 29fe62a..e300fe0 100644 --- a/cc/layer.cc +++ b/cc/layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer.h" #include "cc/active_animation.h" @@ -187,8 +185,8 @@ void Layer::removeChild(Layer* child) void Layer::replaceChild(Layer* reference, scoped_refptr<Layer> newLayer) { - ASSERT_ARG(reference, reference); - ASSERT_ARG(reference, reference->parent() == this); + DCHECK(reference); + DCHECK_EQ(reference->parent(), this); if (reference == newLayer) return; diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc index 876ac9f..2dbdde8 100644 --- a/cc/layer_animation_controller.cc +++ b/cc/layer_animation_controller.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_animation_controller.h" #include "cc/active_animation.h" diff --git a/cc/layer_animation_controller_unittest.cc b/cc/layer_animation_controller_unittest.cc index 6834dfc..b11db33 100644 --- a/cc/layer_animation_controller_unittest.cc +++ b/cc/layer_animation_controller_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_animation_controller.h" #include "cc/active_animation.h" diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index 4598621..25a5fc5 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_impl.h" #include "base/debug/trace_event.h" diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc index 2897f1e..8e1d0aa 100644 --- a/cc/layer_impl_unittest.cc +++ b/cc/layer_impl_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_impl.h" #include "cc/single_thread_proxy.h" diff --git a/cc/layer_iterator.cc b/cc/layer_iterator.cc index 8dfa065..2d95738 100644 --- a/cc/layer_iterator.cc +++ b/cc/layer_iterator.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_iterator.h" #include "cc/layer.h" diff --git a/cc/layer_iterator_unittest.cc b/cc/layer_iterator_unittest.cc index 74e7a3e..d2abd4d 100644 --- a/cc/layer_iterator_unittest.cc +++ b/cc/layer_iterator_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_iterator.h" #include "cc/layer.h" diff --git a/cc/layer_quad.cc b/cc/layer_quad.cc index 0a66873..038c602 100644 --- a/cc/layer_quad.cc +++ b/cc/layer_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_quad.h" #include "base/logging.h" diff --git a/cc/layer_quad_unittest.cc b/cc/layer_quad_unittest.cc index 9d7f78b..64d8c77 100644 --- a/cc/layer_quad_unittest.cc +++ b/cc/layer_quad_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_quad.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc index 8cf9dcd..0ab998f 100644 --- a/cc/layer_sorter.cc +++ b/cc/layer_sorter.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_sorter.h" #include <algorithm> diff --git a/cc/layer_sorter_unittest.cc b/cc/layer_sorter_unittest.cc index 7dad9b8..015bc7b 100644 --- a/cc/layer_sorter_unittest.cc +++ b/cc/layer_sorter_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_sorter.h" #include "cc/layer_impl.h" diff --git a/cc/layer_tiling_data.cc b/cc/layer_tiling_data.cc index 33b9877..ffa04b9 100644 --- a/cc/layer_tiling_data.cc +++ b/cc/layer_tiling_data.cc @@ -3,8 +3,6 @@ // found in the LICENSE file. -#include "config.h" - #include "cc/layer_tiling_data.h" #include "base/logging.h" diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc index 0d7da692..6ff1ff1 100644 --- a/cc/layer_tree_host.cc +++ b/cc/layer_tree_host.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_tree_host.h" #include "base/debug/trace_event.h" diff --git a/cc/layer_tree_host_common.cc b/cc/layer_tree_host_common.cc index a7dd4c8..52b7200 100644 --- a/cc/layer_tree_host_common.cc +++ b/cc/layer_tree_host_common.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_tree_host_common.h" #include "cc/layer.h" diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc index a9cc3e3..6dec444 100644 --- a/cc/layer_tree_host_common_unittest.cc +++ b/cc/layer_tree_host_common_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_tree_host_common.h" #include "cc/content_layer.h" diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc index 9568bd1..5bd3cac 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/layer_tree_host_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_tree_host_impl.h" #include <algorithm> diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc index 5b362fe..cc3e02c 100644 --- a/cc/layer_tree_host_impl_unittest.cc +++ b/cc/layer_tree_host_impl_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_tree_host_impl.h" #include <cmath> diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc index b8c92c2..5f808f0 100644 --- a/cc/layer_tree_host_unittest.cc +++ b/cc/layer_tree_host_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_tree_host.h" #include "base/synchronization/lock.h" diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc index 6c14ccf..0e6baad 100644 --- a/cc/layer_unittest.cc +++ b/cc/layer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer.h" #include "cc/keyframed_animation_curve.h" diff --git a/cc/layer_updater.cc b/cc/layer_updater.cc index 5d021f7..2b0f775 100644 --- a/cc/layer_updater.cc +++ b/cc/layer_updater.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/layer_updater.h" namespace cc { diff --git a/cc/managed_memory_policy.cc b/cc/managed_memory_policy.cc index 1fcb16d..a9e3b7f 100644 --- a/cc/managed_memory_policy.cc +++ b/cc/managed_memory_policy.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "managed_memory_policy.h" #include "priority_calculator.h" diff --git a/cc/math_util.cc b/cc/math_util.cc index 7639e62..606f67b 100644 --- a/cc/math_util.cc +++ b/cc/math_util.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/math_util.h" #include <cmath> diff --git a/cc/math_util_unittest.cc b/cc/math_util_unittest.cc index 571329c..6d929d9 100644 --- a/cc/math_util_unittest.cc +++ b/cc/math_util_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/math_util.h" #include <cmath> diff --git a/cc/nine_patch_layer.cc b/cc/nine_patch_layer.cc index 5ab5ffe..5fce675 100644 --- a/cc/nine_patch_layer.cc +++ b/cc/nine_patch_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/nine_patch_layer.h" #include "cc/layer_tree_host.h" diff --git a/cc/nine_patch_layer_impl.cc b/cc/nine_patch_layer_impl.cc index c68a907..6a5a116 100644 --- a/cc/nine_patch_layer_impl.cc +++ b/cc/nine_patch_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "nine_patch_layer_impl.h" #include "base/stringprintf.h" diff --git a/cc/nine_patch_layer_impl_unittest.cc b/cc/nine_patch_layer_impl_unittest.cc index e552d8e..5539e3c 100644 --- a/cc/nine_patch_layer_impl_unittest.cc +++ b/cc/nine_patch_layer_impl_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/nine_patch_layer_impl.h" #include "cc/append_quads_data.h" diff --git a/cc/nine_patch_layer_unittest.cc b/cc/nine_patch_layer_unittest.cc index 3958b92..eb37b6e 100644 --- a/cc/nine_patch_layer_unittest.cc +++ b/cc/nine_patch_layer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/nine_patch_layer.h" #include "cc/layer_tree_host.h" diff --git a/cc/occlusion_tracker.cc b/cc/occlusion_tracker.cc index cefcd9d..b131c08 100644 --- a/cc/occlusion_tracker.cc +++ b/cc/occlusion_tracker.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/occlusion_tracker.h" #include <algorithm> diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc index 187ab21..7bdc4da 100644 --- a/cc/occlusion_tracker_unittest.cc +++ b/cc/occlusion_tracker_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/occlusion_tracker.h" #include "cc/layer.h" diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc index 1f8aed8..dbcfa9a 100644 --- a/cc/overdraw_metrics.cc +++ b/cc/overdraw_metrics.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/overdraw_metrics.h" #include "base/debug/trace_event.h" diff --git a/cc/page_scale_animation.cc b/cc/page_scale_animation.cc index 19da97f..5d9e882 100644 --- a/cc/page_scale_animation.cc +++ b/cc/page_scale_animation.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/page_scale_animation.h" #include "cc/geometry.h" diff --git a/cc/picture.cc b/cc/picture.cc index f7e0a4e..7a17d5c 100644 --- a/cc/picture.cc +++ b/cc/picture.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "base/debug/trace_event.h" #include "cc/content_layer_client.h" #include "cc/picture.h" diff --git a/cc/picture_layer.cc b/cc/picture_layer.cc index 1b79a3e..d1f6c3d 100644 --- a/cc/picture_layer.cc +++ b/cc/picture_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/picture_layer.h" #include "cc/picture_layer_impl.h" #include "ui/gfx/rect_conversions.h" diff --git a/cc/picture_layer_impl.cc b/cc/picture_layer_impl.cc index 9f42e12..e6cdb5d 100644 --- a/cc/picture_layer_impl.cc +++ b/cc/picture_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/picture_layer_impl.h" namespace cc { diff --git a/cc/picture_pile.cc b/cc/picture_pile.cc index 63858d2..2b947e1 100644 --- a/cc/picture_pile.cc +++ b/cc/picture_pile.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include <algorithm> #include "cc/picture_pile.h" diff --git a/cc/prioritized_resource.cc b/cc/prioritized_resource.cc index 86911b1..1742d7d 100644 --- a/cc/prioritized_resource.cc +++ b/cc/prioritized_resource.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/prioritized_resource.h" #include "cc/platform_color.h" diff --git a/cc/prioritized_resource_manager.cc b/cc/prioritized_resource_manager.cc index e628276..ba32324 100644 --- a/cc/prioritized_resource_manager.cc +++ b/cc/prioritized_resource_manager.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/prioritized_resource_manager.h" #include "base/debug/trace_event.h" diff --git a/cc/prioritized_resource_unittest.cc b/cc/prioritized_resource_unittest.cc index c542395..35a4ac4 100644 --- a/cc/prioritized_resource_unittest.cc +++ b/cc/prioritized_resource_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/prioritized_resource.h" #include "cc/prioritized_resource_manager.h" diff --git a/cc/priority_calculator.cc b/cc/priority_calculator.cc index e03229d..0895ef3 100644 --- a/cc/priority_calculator.cc +++ b/cc/priority_calculator.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/priority_calculator.h" #include "ui/gfx/rect.h" diff --git a/cc/program_binding.cc b/cc/program_binding.cc index 4f51351..ccbca53 100644 --- a/cc/program_binding.cc +++ b/cc/program_binding.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/program_binding.h" #include "base/debug/trace_event.h" diff --git a/cc/proxy.cc b/cc/proxy.cc index 5682a3f..9a07254 100644 --- a/cc/proxy.cc +++ b/cc/proxy.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/proxy.h" #include "cc/thread.h" diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc index d2636e6..31c0c0d 100644 --- a/cc/quad_culler.cc +++ b/cc/quad_culler.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/quad_culler.h" #include "cc/append_quads_data.h" diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc index dfcf147..7ecb95d 100644 --- a/cc/quad_culler_unittest.cc +++ b/cc/quad_culler_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/quad_culler.h" #include "cc/append_quads_data.h" diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc index 3b16e5d..7f40bb2 100644 --- a/cc/rate_limiter.cc +++ b/cc/rate_limiter.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/rate_limiter.h" #include "base/debug/trace_event.h" diff --git a/cc/region.cc b/cc/region.cc index 4167417..a33965c 100644 --- a/cc/region.cc +++ b/cc/region.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/region.h" namespace cc { diff --git a/cc/region_unittest.cc b/cc/region_unittest.cc index ef1d889..12d2715 100644 --- a/cc/region_unittest.cc +++ b/cc/region_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/region.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/render_pass.cc b/cc/render_pass.cc index 76beaeb..9772430 100644 --- a/cc/render_pass.cc +++ b/cc/render_pass.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_pass.h" #include "cc/layer_impl.h" diff --git a/cc/render_pass_draw_quad.cc b/cc/render_pass_draw_quad.cc index 37ed51e..5b0a19e 100644 --- a/cc/render_pass_draw_quad.cc +++ b/cc/render_pass_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_pass_draw_quad.h" namespace cc { diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc index 9f37e10b..a6c0808 100644 --- a/cc/render_pass_unittest.cc +++ b/cc/render_pass_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_pass.h" #include "cc/checkerboard_draw_quad.h" diff --git a/cc/render_surface.cc b/cc/render_surface.cc index ca8fd55..0d0efd7 100644 --- a/cc/render_surface.cc +++ b/cc/render_surface.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_surface.h" #include "cc/layer.h" diff --git a/cc/render_surface_filters.cc b/cc/render_surface_filters.cc index 6345b34..4b9a49d 100644 --- a/cc/render_surface_filters.cc +++ b/cc/render_surface_filters.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_surface_filters.h" #include "base/logging.h" diff --git a/cc/render_surface_filters_unittest.cc b/cc/render_surface_filters_unittest.cc index 05a15c14..71c4a82 100644 --- a/cc/render_surface_filters_unittest.cc +++ b/cc/render_surface_filters_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_surface_filters.h" #include "cc/test/compositor_fake_web_graphics_context_3d.h" diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc index a321424..6ba3fc5 100644 --- a/cc/render_surface_impl.cc +++ b/cc/render_surface_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_surface_impl.h" #include <algorithm> diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc index bde530a..02ffb2c 100644 --- a/cc/render_surface_unittest.cc +++ b/cc/render_surface_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/render_surface_impl.h" #include "cc/append_quads_data.h" diff --git a/cc/renderer.cc b/cc/renderer.cc index 2dac708..50f07a3 100644 --- a/cc/renderer.cc +++ b/cc/renderer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/renderer.h" namespace cc { diff --git a/cc/resource.cc b/cc/resource.cc index 0995793..73b00af 100644 --- a/cc/resource.cc +++ b/cc/resource.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/resource.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc index 757afe3..d60d664 100644 --- a/cc/resource_provider.cc +++ b/cc/resource_provider.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/resource_provider.h" #include <limits.h> @@ -153,7 +151,7 @@ ResourceProvider::ResourceId ResourceProvider::createResource(int pool, const gf return createBitmap(pool, size); } - CRASH(); + LOG(FATAL) << "Invalid default resource type."; return 0; } diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc index 1b5f145..5afb829 100644 --- a/cc/resource_provider_unittest.cc +++ b/cc/resource_provider_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/resource_provider.h" #include "base/logging.h" diff --git a/cc/resource_update.cc b/cc/resource_update.cc index 6f224a9..2f3d312 100644 --- a/cc/resource_update.cc +++ b/cc/resource_update.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/resource_update.h" #include "base/logging.h" diff --git a/cc/resource_update_controller.cc b/cc/resource_update_controller.cc index 09de283..69bddb1 100644 --- a/cc/resource_update_controller.cc +++ b/cc/resource_update_controller.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/resource_update_controller.h" #include "base/debug/trace_event.h" diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc index 2bb9ff8..fc02348 100644 --- a/cc/resource_update_controller_unittest.cc +++ b/cc/resource_update_controller_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/resource_update_controller.h" #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread diff --git a/cc/resource_update_queue.cc b/cc/resource_update_queue.cc index 367a4116..14ecab0 100644 --- a/cc/resource_update_queue.cc +++ b/cc/resource_update_queue.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/resource_update_queue.h" #include "cc/prioritized_resource.h" diff --git a/cc/scheduler.cc b/cc/scheduler.cc index 2a8f41a..8a76fc9 100644 --- a/cc/scheduler.cc +++ b/cc/scheduler.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scheduler.h" #include "base/auto_reset.h" diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler_state_machine.cc index c067f7b..d0a3577 100644 --- a/cc/scheduler_state_machine.cc +++ b/cc/scheduler_state_machine.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scheduler_state_machine.h" #include "base/logging.h" diff --git a/cc/scheduler_state_machine_unittest.cc b/cc/scheduler_state_machine_unittest.cc index f392e85..5fcbb29 100644 --- a/cc/scheduler_state_machine_unittest.cc +++ b/cc/scheduler_state_machine_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scheduler_state_machine.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc index 10b166f..ec7cfc1 100644 --- a/cc/scheduler_unittest.cc +++ b/cc/scheduler_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scheduler.h" #include "base/logging.h" diff --git a/cc/scoped_resource.cc b/cc/scoped_resource.cc index 5729718..34a6351 100644 --- a/cc/scoped_resource.cc +++ b/cc/scoped_resource.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scoped_resource.h" namespace cc { diff --git a/cc/scoped_resource_unittest.cc b/cc/scoped_resource_unittest.cc index 612e5a7..0187bbe 100644 --- a/cc/scoped_resource_unittest.cc +++ b/cc/scoped_resource_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scoped_resource.h" #include "cc/renderer.h" diff --git a/cc/scoped_thread_proxy.cc b/cc/scoped_thread_proxy.cc index a5ad931..03aa6de 100644 --- a/cc/scoped_thread_proxy.cc +++ b/cc/scoped_thread_proxy.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scoped_thread_proxy.h" #include "base/bind.h" diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc index 529884f..4d75877 100644 --- a/cc/scrollbar_animation_controller.cc +++ b/cc/scrollbar_animation_controller.cc @@ -2,20 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_animation_controller.h" -#include "cc/scrollbar_layer_impl.h" #include "base/time.h" +#include "build/build_config.h" +#include "cc/scrollbar_layer_impl.h" -#if OS(ANDROID) +#if defined(OS_ANDROID) #include "cc/scrollbar_animation_controller_linear_fade.h" #endif namespace cc { -#if OS(ANDROID) +#if defined(OS_ANDROID) scoped_ptr<ScrollbarAnimationController> ScrollbarAnimationController::create(LayerImpl* scrollLayer) { static const double fadeoutDelay = 0.3; diff --git a/cc/scrollbar_animation_controller_linear_fade.cc b/cc/scrollbar_animation_controller_linear_fade.cc index 0289804..201f6d4 100644 --- a/cc/scrollbar_animation_controller_linear_fade.cc +++ b/cc/scrollbar_animation_controller_linear_fade.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_animation_controller_linear_fade.h" #include "cc/scrollbar_layer_impl.h" diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc index 4469b06..0ffe2f4 100644 --- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_animation_controller_linear_fade.h" #include "cc/scrollbar_layer_impl.h" diff --git a/cc/scrollbar_geometry_fixed_thumb.cc b/cc/scrollbar_geometry_fixed_thumb.cc index 74172ce..2c38049 100644 --- a/cc/scrollbar_geometry_fixed_thumb.cc +++ b/cc/scrollbar_geometry_fixed_thumb.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_geometry_fixed_thumb.h" #include <cmath> diff --git a/cc/scrollbar_geometry_stub.cc b/cc/scrollbar_geometry_stub.cc index 21fb8f3..b9f8cf2 100644 --- a/cc/scrollbar_geometry_stub.cc +++ b/cc/scrollbar_geometry_stub.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_geometry_stub.h" using WebKit::WebRect; diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc index 0c19975..392369f 100644 --- a/cc/scrollbar_layer.cc +++ b/cc/scrollbar_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_layer.h" #include "base/basictypes.h" diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc index f0cfb914..02468a6 100644 --- a/cc/scrollbar_layer_impl.cc +++ b/cc/scrollbar_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_layer_impl.h" #include "cc/quad_sink.h" diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc index e9010f9..94386bc 100644 --- a/cc/scrollbar_layer_unittest.cc +++ b/cc/scrollbar_layer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/scrollbar_layer.h" #include "cc/scrollbar_animation_controller.h" diff --git a/cc/settings.cc b/cc/settings.cc index 443ebfe..9a33af1 100644 --- a/cc/settings.cc +++ b/cc/settings.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "base/command_line.h" #include "cc/settings.h" #include "cc/switches.h" diff --git a/cc/shader.cc b/cc/shader.cc index 567d56c..a9a0877 100644 --- a/cc/shader.cc +++ b/cc/shader.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/shader.h" #include "base/basictypes.h" diff --git a/cc/shared_quad_state.cc b/cc/shared_quad_state.cc index aae9617..914cbc2 100644 --- a/cc/shared_quad_state.cc +++ b/cc/shared_quad_state.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/shared_quad_state.h" namespace cc { diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc index 4d4e836..a91738f 100644 --- a/cc/single_thread_proxy.cc +++ b/cc/single_thread_proxy.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/single_thread_proxy.h" #include "base/debug/trace_event.h" diff --git a/cc/skpicture_content_layer_updater.cc b/cc/skpicture_content_layer_updater.cc index 8897f24..869c6cd 100644 --- a/cc/skpicture_content_layer_updater.cc +++ b/cc/skpicture_content_layer_updater.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/skpicture_content_layer_updater.h" #include "base/debug/trace_event.h" diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc index 6a64cc8..78a9229 100644 --- a/cc/software_renderer.cc +++ b/cc/software_renderer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/software_renderer.h" #include "cc/debug_border_draw_quad.h" @@ -168,7 +166,7 @@ bool SoftwareRenderer::isSoftwareResource(ResourceProvider::ResourceId id) const return true; } - CRASH(); + LOG(FATAL) << "Invalid resource type."; return false; } diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc index e0fd5dd..83eab60 100644 --- a/cc/software_renderer_unittest.cc +++ b/cc/software_renderer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/software_renderer.h" #include "cc/quad_sink.h" diff --git a/cc/solid_color_draw_quad.cc b/cc/solid_color_draw_quad.cc index 85b30b2..b1bc3c6 100644 --- a/cc/solid_color_draw_quad.cc +++ b/cc/solid_color_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/solid_color_draw_quad.h" #include "base/logging.h" diff --git a/cc/solid_color_layer.cc b/cc/solid_color_layer.cc index 7bfbcb2..29d3708 100644 --- a/cc/solid_color_layer.cc +++ b/cc/solid_color_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/solid_color_layer.h" #include "cc/solid_color_layer_impl.h" diff --git a/cc/solid_color_layer_impl.cc b/cc/solid_color_layer_impl.cc index c08a549..cf11f86 100644 --- a/cc/solid_color_layer_impl.cc +++ b/cc/solid_color_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/solid_color_layer_impl.h" #include "cc/quad_sink.h" diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc index f228d2b..10afe26 100644 --- a/cc/solid_color_layer_impl_unittest.cc +++ b/cc/solid_color_layer_impl_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/solid_color_layer_impl.h" #include "cc/append_quads_data.h" diff --git a/cc/stream_video_draw_quad.cc b/cc/stream_video_draw_quad.cc index 9d3a335..737ac5d 100644 --- a/cc/stream_video_draw_quad.cc +++ b/cc/stream_video_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/stream_video_draw_quad.h" #include "base/logging.h" diff --git a/cc/stubs/config.h b/cc/stubs/config.h deleted file mode 100644 index df9b726..0000000 --- a/cc/stubs/config.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CC_STUBS_CONFIG_H_ -#define CC_STUBS_CONFIG_H_ - -// Chromium's LOG() macro collides with one from WTF. - -#if INSIDE_WEBKIT_BUILD -#include "Source/WTF/config.h" -#else -#include "third_party/WebKit/Source/WTF/config.h" -#endif - -#include <wtf/Assertions.h> -#ifdef LOG -#undef LOG -#endif - -#endif // CC_STUBS_CONFIG_H_ diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index 9b8bff0..f728818 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/animation_test_common.h" #include "cc/keyframed_animation_curve.h" diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc index 69b4d96..8f91663 100644 --- a/cc/test/fake_content_layer_client.cc +++ b/cc/test/fake_content_layer_client.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/fake_content_layer_client.h" #include "ui/gfx/rect.h" diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h index cc6cf35..1cf4646 100644 --- a/cc/test/fake_content_layer_client.h +++ b/cc/test/fake_content_layer_client.h @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/compiler_specific.h" #include "cc/content_layer_client.h" namespace WebKitTests { diff --git a/cc/test/fake_graphics_context_3d_unittest.cc b/cc/test/fake_graphics_context_3d_unittest.cc index 57912295..bea0bdf 100644 --- a/cc/test/fake_graphics_context_3d_unittest.cc +++ b/cc/test/fake_graphics_context_3d_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "cc/test/fake_web_graphics_context_3d.h" diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc index 542f4bc..cddece1 100644 --- a/cc/test/fake_layer_tree_host_client.cc +++ b/cc/test/fake_layer_tree_host_client.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/fake_layer_tree_host_client.h" namespace cc { diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h index 78e7a8f..5ca8168 100644 --- a/cc/test/fake_layer_tree_host_client.h +++ b/cc/test/fake_layer_tree_host_client.h @@ -4,8 +4,6 @@ #ifndef CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_ #define CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_ -#include "config.h" - #include "base/memory/scoped_ptr.h" #include "cc/input_handler.h" #include "cc/layer_tree_host.h" diff --git a/cc/test/fake_proxy.cc b/cc/test/fake_proxy.cc index fad6c69..d6dbb40 100644 --- a/cc/test/fake_proxy.cc +++ b/cc/test/fake_proxy.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/fake_proxy.h" namespace cc { diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h index 3a00204..5a77f69 100644 --- a/cc/test/fake_proxy.h +++ b/cc/test/fake_proxy.h @@ -5,8 +5,6 @@ #ifndef FakeCCProxy_h #define FakeCCProxy_h -#include "config.h" - #include "cc/layer_tree_host.h" #include "cc/proxy.h" #include "cc/thread.h" diff --git a/cc/test/geometry_test_utils.cc b/cc/test/geometry_test_utils.cc index a76517c..68afd4b 100644 --- a/cc/test/geometry_test_utils.cc +++ b/cc/test/geometry_test_utils.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/geometry_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" @@ -33,4 +31,3 @@ void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expecte } } // namespace WebKitTests - diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc index d26cfc3..ba8bc14 100644 --- a/cc/test/layer_test_common.cc +++ b/cc/test/layer_test_common.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/layer_test_common.h" #include "cc/draw_quad.h" diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc index db46e18..3fe084f 100644 --- a/cc/test/layer_tree_test_common.cc +++ b/cc/test/layer_tree_test_common.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/layer_tree_test_common.h" #include "base/stl_util.h" diff --git a/cc/test/mock_quad_culler.cc b/cc/test/mock_quad_culler.cc index 36c4071..beb8d67 100644 --- a/cc/test/mock_quad_culler.cc +++ b/cc/test/mock_quad_culler.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/mock_quad_culler.h" namespace cc { diff --git a/cc/test/scheduler_test_common.cc b/cc/test/scheduler_test_common.cc index 4d2c13c..547124e 100644 --- a/cc/test/scheduler_test_common.cc +++ b/cc/test/scheduler_test_common.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/scheduler_test_common.h" #include "base/logging.h" diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc index 12172f1..f8db177 100644 --- a/cc/test/tiled_layer_test_common.cc +++ b/cc/test/tiled_layer_test_common.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/test/tiled_layer_test_common.h" using namespace cc; diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc index ddb0f7a..5bb4e1b 100644 --- a/cc/texture_copier.cc +++ b/cc/texture_copier.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_copier.h" #include "base/debug/trace_event.h" +#include "build/build_config.h" #include "cc/gl_renderer.h" // For the GLC() macro. #include "third_party/khronos/GLES2/gl2.h" #include <public/WebGraphicsContext3D.h> @@ -55,7 +54,7 @@ void AcceleratedTextureCopier::copyTexture(Parameters parameters) GLC(m_context, m_context->bindFramebuffer(GL_FRAMEBUFFER, m_fbo)); GLC(m_context, m_context->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, parameters.destTexture, 0)); -#if OS(ANDROID) +#if defined(OS_ANDROID) // Clear destination to improve performance on tiling GPUs. // TODO: Use EXT_discard_framebuffer or skip clearing if it isn't available. GLC(m_context, m_context->clear(GL_COLOR_BUFFER_BIT)); diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc index 5765c51..7736319 100644 --- a/cc/texture_copier_unittest.cc +++ b/cc/texture_copier_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_copier.h" #include "cc/test/fake_web_graphics_context_3d.h" diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc index 6a07450..36c97be 100644 --- a/cc/texture_draw_quad.cc +++ b/cc/texture_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_draw_quad.h" #include "base/logging.h" diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc index 14e848d..2afa51c 100644 --- a/cc/texture_layer.cc +++ b/cc/texture_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_layer.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc index f5c0e88..291ea46 100644 --- a/cc/texture_layer_impl.cc +++ b/cc/texture_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_layer_impl.h" #include "base/stringprintf.h" diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc index 6e65978..8cc887b 100644 --- a/cc/texture_layer_unittest.cc +++ b/cc/texture_layer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_layer.h" #include "cc/layer_tree_host.h" diff --git a/cc/texture_uploader.cc b/cc/texture_uploader.cc index ed02f36..a1c812a 100644 --- a/cc/texture_uploader.cc +++ b/cc/texture_uploader.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_uploader.h" #include <algorithm> diff --git a/cc/texture_uploader_unittest.cc b/cc/texture_uploader_unittest.cc index f9cf31f..61beb44 100644 --- a/cc/texture_uploader_unittest.cc +++ b/cc/texture_uploader_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/texture_uploader.h" #include "cc/prioritized_resource.h" diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc index 6507828..bfff733 100644 --- a/cc/thread_proxy.cc +++ b/cc/thread_proxy.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/thread_proxy.h" #include "base/bind.h" diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc index f1e187d..560dd05 100644 --- a/cc/tile_draw_quad.cc +++ b/cc/tile_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tile_draw_quad.h" #include "base/logging.h" diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc index f3377b1..77be6eb 100644 --- a/cc/tiled_layer.cc +++ b/cc/tiled_layer.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tiled_layer.h" #include "base/basictypes.h" +#include "build/build_config.h" #include "cc/geometry.h" #include "cc/layer_impl.h" #include "cc/layer_tree_host.h" @@ -261,10 +260,8 @@ UpdatableTile* TiledLayer::createTile(int i, int j) addedTile->dirtyRect = m_tiler->tileRect(addedTile); // Temporary diagnostic crash. - if (!addedTile) - CRASH(); - if (!tileAt(i, j)) - CRASH(); + CHECK(addedTile); + CHECK(tileAt(i, j)); return addedTile; } @@ -280,7 +277,7 @@ void TiledLayer::setUseLCDText(bool useLCDText) ContentsScalingLayer::setUseLCDText(useLCDText); LayerTilingData::BorderTexelOption borderTexelOption; -#if OS(ANDROID) +#if defined(OS_ANDROID) // Always want border texels and GL_LINEAR due to pinch zoom. borderTexelOption = LayerTilingData::HasBorderTexels; #else @@ -490,21 +487,15 @@ void TiledLayer::updateTileTextures(const gfx::Rect& paintRect, int left, int to // Calculate tile-space rectangle to upload into. gfx::Vector2d destOffset = sourceRect.origin() - anchor; - if (destOffset.x() < 0) - CRASH(); - if (destOffset.y() < 0) - CRASH(); + CHECK(destOffset.x() >= 0); + CHECK(destOffset.y() >= 0); // Offset from paint rectangle to this tile's dirty rectangle. gfx::Vector2d paintOffset = sourceRect.origin() - paintRect.origin(); - if (paintOffset.x() < 0) - CRASH(); - if (paintOffset.y() < 0) - CRASH(); - if (paintOffset.x() + sourceRect.width() > paintRect.width()) - CRASH(); - if (paintOffset.y() + sourceRect.height() > paintRect.height()) - CRASH(); + CHECK(paintOffset.x() >= 0); + CHECK(paintOffset.y() >= 0); + CHECK(paintOffset.x() + sourceRect.width() <= paintRect.width()); + CHECK(paintOffset.y() + sourceRect.height() <= paintRect.height()); tile->updaterResource()->update(queue, sourceRect, destOffset, tile->partialUpdate, stats); if (occlusion) diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc index b7fe7b8..03ffc74 100644 --- a/cc/tiled_layer_impl.cc +++ b/cc/tiled_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tiled_layer_impl.h" #include "base/basictypes.h" diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc index 323ce89..eed95f5 100644 --- a/cc/tiled_layer_impl_unittest.cc +++ b/cc/tiled_layer_impl_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tiled_layer_impl.h" #include "cc/append_quads_data.h" diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc index d9f93a7..b38cba6 100644 --- a/cc/tiled_layer_unittest.cc +++ b/cc/tiled_layer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tiled_layer.h" #include "cc/bitmap_content_layer_updater.h" diff --git a/cc/tiling_data.cc b/cc/tiling_data.cc index 022c40f..3906d2c 100644 --- a/cc/tiling_data.cc +++ b/cc/tiling_data.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tiling_data.h" #include <algorithm> diff --git a/cc/timing_function.cc b/cc/timing_function.cc index 7aef57e..c98ec90 100644 --- a/cc/timing_function.cc +++ b/cc/timing_function.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/timing_function.h" #include "third_party/skia/include/core/SkMath.h" diff --git a/cc/timing_function_unittest.cc b/cc/timing_function_unittest.cc index 69b3267..b2aaf1d 100644 --- a/cc/timing_function_unittest.cc +++ b/cc/timing_function_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/timing_function.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc index ca4f2bb..4c51a16 100644 --- a/cc/tree_synchronizer.cc +++ b/cc/tree_synchronizer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tree_synchronizer.h" #include "cc/layer.h" diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc index 8f3585c..99f35bd 100644 --- a/cc/tree_synchronizer_unittest.cc +++ b/cc/tree_synchronizer_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/tree_synchronizer.h" #include <algorithm> diff --git a/cc/video_layer.cc b/cc/video_layer.cc index 1d3e7d8..e8a9fad 100644 --- a/cc/video_layer.cc +++ b/cc/video_layer.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/video_layer.h" #include "cc/video_layer_impl.h" diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index 3b2e3a9..9930a0c 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/video_layer_impl.h" #include "base/logging.h" diff --git a/cc/yuv_video_draw_quad.cc b/cc/yuv_video_draw_quad.cc index ff60e1e..b781b2c 100644 --- a/cc/yuv_video_draw_quad.cc +++ b/cc/yuv_video_draw_quad.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "cc/yuv_video_draw_quad.h" #include "base/logging.h" diff --git a/content/content_shell.gypi b/content/content_shell.gypi index e5841f2..b622bea 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -154,6 +154,11 @@ }, }, }], # OS=="win" + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:fontconfig', + ], + }], ['OS=="android"', { 'dependencies': [ 'content_shell_jni_headers', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 03270e6..93b60b2 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -494,6 +494,8 @@ '../ipc/ipc.gyp:test_support_ipc', '../jingle/jingle.gyp:jingle_glue_test_util', '../media/media.gyp:shared_memory_support', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libjingle/libjingle.gyp:libjingle', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp index 2b421fc..16158f3 100644 --- a/webkit/compositor_bindings/compositor_bindings.gyp +++ b/webkit/compositor_bindings/compositor_bindings.gyp @@ -45,7 +45,6 @@ 'type': 'static_library', 'dependencies': [ '../../skia/skia.gyp:skia', - '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf', 'webkit_compositor_bindings', ], 'sources': [ @@ -74,10 +73,6 @@ '../../cc/cc.gyp:cc', '../../skia/skia.gyp:skia', '../../ui/ui.gyp:ui', - # We have to depend on WTF directly to pick up the correct defines for WTF headers - for instance USE_SYSTEM_MALLOC. - '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf', - '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support', ], 'include_dirs': [ '../../cc', diff --git a/webkit/compositor_bindings/compositor_bindings_tests.gyp b/webkit/compositor_bindings/compositor_bindings_tests.gyp index 9cb420e..b716729 100644 --- a/webkit/compositor_bindings/compositor_bindings_tests.gyp +++ b/webkit/compositor_bindings/compositor_bindings_tests.gyp @@ -28,7 +28,6 @@ '../../skia/skia.gyp:skia', '../../testing/gmock.gyp:gmock', '../../testing/gtest.gyp:gtest', - '../../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf', 'compositor_bindings.gyp:webkit_compositor_bindings', ], 'sources': [ diff --git a/webkit/compositor_bindings/web_animation_curve_common.cc b/webkit/compositor_bindings/web_animation_curve_common.cc index 09092bd..3b59346 100644 --- a/webkit/compositor_bindings/web_animation_curve_common.cc +++ b/webkit/compositor_bindings/web_animation_curve_common.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "web_animation_curve_common.h" #include "cc/timing_function.h" diff --git a/webkit/compositor_bindings/web_animation_impl.cc b/webkit/compositor_bindings/web_animation_impl.cc index 4720199..0e156fa 100644 --- a/webkit/compositor_bindings/web_animation_impl.cc +++ b/webkit/compositor_bindings/web_animation_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "web_animation_impl.h" #include "cc/active_animation.h" diff --git a/webkit/compositor_bindings/web_animation_unittest.cc b/webkit/compositor_bindings/web_animation_unittest.cc index eead7b2..2d633d0 100644 --- a/webkit/compositor_bindings/web_animation_unittest.cc +++ b/webkit/compositor_bindings/web_animation_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "web_animation_impl.h" diff --git a/webkit/compositor_bindings/web_compositor_support_impl.cc b/webkit/compositor_bindings/web_compositor_support_impl.cc index 5e5a4d4..48af47e 100644 --- a/webkit/compositor_bindings/web_compositor_support_impl.cc +++ b/webkit/compositor_bindings/web_compositor_support_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "webkit/compositor_bindings/web_compositor_support_impl.h" #include "base/debug/trace_event.h" diff --git a/webkit/compositor_bindings/web_content_layer_impl.cc b/webkit/compositor_bindings/web_content_layer_impl.cc index fe300b1..853970d 100644 --- a/webkit/compositor_bindings/web_content_layer_impl.cc +++ b/webkit/compositor_bindings/web_content_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_content_layer_impl.h" #include "SkMatrix44.h" diff --git a/webkit/compositor_bindings/web_delegated_renderer_layer_impl.cc b/webkit/compositor_bindings/web_delegated_renderer_layer_impl.cc index 9a9f6a7..d227e59 100644 --- a/webkit/compositor_bindings/web_delegated_renderer_layer_impl.cc +++ b/webkit/compositor_bindings/web_delegated_renderer_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_delegated_renderer_layer_impl.h" #include "cc/delegated_renderer_layer.h" diff --git a/webkit/compositor_bindings/web_external_texture_layer_impl.cc b/webkit/compositor_bindings/web_external_texture_layer_impl.cc index 54e71ad..b374e9d 100644 --- a/webkit/compositor_bindings/web_external_texture_layer_impl.cc +++ b/webkit/compositor_bindings/web_external_texture_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_external_texture_layer_impl.h" #include "cc/resource_update_queue.h" @@ -97,14 +96,14 @@ private: unsigned WebExternalTextureLayerImpl::prepareTexture(ResourceUpdateQueue& queue) { - ASSERT(m_client); + DCHECK(m_client); WebTextureUpdaterImpl updaterImpl(queue); return m_client->prepareTexture(updaterImpl); } WebGraphicsContext3D* WebExternalTextureLayerImpl::context() { - ASSERT(m_client); + DCHECK(m_client); return m_client->context(); } diff --git a/webkit/compositor_bindings/web_float_animation_curve_impl.cc b/webkit/compositor_bindings/web_float_animation_curve_impl.cc index cbd9a53..9496cc6 100644 --- a/webkit/compositor_bindings/web_float_animation_curve_impl.cc +++ b/webkit/compositor_bindings/web_float_animation_curve_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "web_float_animation_curve_impl.h" #include "cc/animation_curve.h" diff --git a/webkit/compositor_bindings/web_float_animation_curve_unittest.cc b/webkit/compositor_bindings/web_float_animation_curve_unittest.cc index ee1b74e..175aded 100644 --- a/webkit/compositor_bindings/web_float_animation_curve_unittest.cc +++ b/webkit/compositor_bindings/web_float_animation_curve_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "web_float_animation_curve_impl.h" #include "base/memory/scoped_ptr.h" #include "cc/timing_function.h" diff --git a/webkit/compositor_bindings/web_image_layer_impl.cc b/webkit/compositor_bindings/web_image_layer_impl.cc index a40391f..551ecf8 100644 --- a/webkit/compositor_bindings/web_image_layer_impl.cc +++ b/webkit/compositor_bindings/web_image_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_image_layer_impl.h" #include "cc/image_layer.h" diff --git a/webkit/compositor_bindings/web_io_surface_layer_impl.cc b/webkit/compositor_bindings/web_io_surface_layer_impl.cc index 3469503..d6236ac 100644 --- a/webkit/compositor_bindings/web_io_surface_layer_impl.cc +++ b/webkit/compositor_bindings/web_io_surface_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_io_surface_layer_impl.h" #include "cc/io_surface_layer.h" diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc index 0201598..7856d2c 100644 --- a/webkit/compositor_bindings/web_layer_impl.cc +++ b/webkit/compositor_bindings/web_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_layer_impl.h" #include "SkMatrix44.h" @@ -334,7 +333,7 @@ bool WebLayerImpl::hasActiveAnimation() void WebLayerImpl::transferAnimationsTo(WebLayer* other) { - ASSERT(other); + DCHECK(other); static_cast<WebLayerImpl*>(other)->m_layer->setLayerAnimationController(m_layer->releaseLayerAnimationController()); } diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index af3bdac..f51d04e 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_layer_tree_view_impl.h" #include "cc/font_atlas.h" diff --git a/webkit/compositor_bindings/web_layer_tree_view_unittest.cc b/webkit/compositor_bindings/web_layer_tree_view_unittest.cc index 06b6499..8ed8863 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_unittest.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "base/cancelable_callback.h" #include "base/memory/ref_counted.h" #include "base/threading/thread.h" diff --git a/webkit/compositor_bindings/web_layer_unittest.cc b/webkit/compositor_bindings/web_layer_unittest.cc index dc70d69..ed94edb 100644 --- a/webkit/compositor_bindings/web_layer_unittest.cc +++ b/webkit/compositor_bindings/web_layer_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include <public/WebLayer.h> #include "cc/thread.h" diff --git a/webkit/compositor_bindings/web_nine_patch_layer_impl.cc b/webkit/compositor_bindings/web_nine_patch_layer_impl.cc index 2d30b35..c24a810 100644 --- a/webkit/compositor_bindings/web_nine_patch_layer_impl.cc +++ b/webkit/compositor_bindings/web_nine_patch_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_nine_patch_layer_impl.h" #include "cc/nine_patch_layer.h" diff --git a/webkit/compositor_bindings/web_scrollbar_layer_impl.cc b/webkit/compositor_bindings/web_scrollbar_layer_impl.cc index c9fffb6..dbadb31 100644 --- a/webkit/compositor_bindings/web_scrollbar_layer_impl.cc +++ b/webkit/compositor_bindings/web_scrollbar_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_scrollbar_layer_impl.h" #include "cc/scrollbar_layer.h" diff --git a/webkit/compositor_bindings/web_solid_color_layer_impl.cc b/webkit/compositor_bindings/web_solid_color_layer_impl.cc index 62f8c8d..d6f2700 100644 --- a/webkit/compositor_bindings/web_solid_color_layer_impl.cc +++ b/webkit/compositor_bindings/web_solid_color_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "web_solid_color_layer_impl.h" #include "cc/solid_color_layer.h" diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc index b8bb602..9d68cf3 100644 --- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc +++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "web_to_ccinput_handler_adapter.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandlerClient.h" diff --git a/webkit/compositor_bindings/web_transform_animation_curve_impl.cc b/webkit/compositor_bindings/web_transform_animation_curve_impl.cc index 07c75f3..facd945 100644 --- a/webkit/compositor_bindings/web_transform_animation_curve_impl.cc +++ b/webkit/compositor_bindings/web_transform_animation_curve_impl.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "web_transform_animation_curve_impl.h" #include "cc/keyframed_animation_curve.h" diff --git a/webkit/compositor_bindings/web_transform_animation_curve_unittest.cc b/webkit/compositor_bindings/web_transform_animation_curve_unittest.cc index db9e467..0234a22 100644 --- a/webkit/compositor_bindings/web_transform_animation_curve_unittest.cc +++ b/webkit/compositor_bindings/web_transform_animation_curve_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "base/memory/scoped_ptr.h" #include "cc/timing_function.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/compositor_bindings/web_transform_operations_unittest.cc b/webkit/compositor_bindings/web_transform_operations_unittest.cc index 9f1e142..2c17082 100644 --- a/webkit/compositor_bindings/web_transform_operations_unittest.cc +++ b/webkit/compositor_bindings/web_transform_operations_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "base/memory/scoped_vector.h" #include "cc/test/geometry_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" @@ -610,4 +608,3 @@ TEST(WebTransformOperationTest, blendPerspectiveToIdentity) EXPECT_TRANSFORMATION_MATRIX_EQ(expected, identityOperations[i]->blend(operations, progress)); } } - diff --git a/webkit/compositor_bindings/web_transformation_matrix_unittest.cc b/webkit/compositor_bindings/web_transformation_matrix_unittest.cc index b470c15..fa6ae8e 100644 --- a/webkit/compositor_bindings/web_transformation_matrix_unittest.cc +++ b/webkit/compositor_bindings/web_transformation_matrix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #define _USE_MATH_DEFINES #include <math.h> diff --git a/webkit/compositor_bindings/web_video_layer_impl.cc b/webkit/compositor_bindings/web_video_layer_impl.cc index a799b03..bea4c5e 100644 --- a/webkit/compositor_bindings/web_video_layer_impl.cc +++ b/webkit/compositor_bindings/web_video_layer_impl.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "webkit/compositor_bindings/web_video_layer_impl.h" #include "base/bind.h" |