Remove WTF and WebCore from cc/ and webkit/compositor_bindings/

cc/tiled_layer.cc

 // Copyright 2011 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.
 
-#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"
 #include "cc/overdraw_metrics.h"
 #include "cc/tiled_layer_impl.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/rect_conversions.h"
 
 using namespace std;
 using WebKit::WebTransformationMatrix;
@@ skipping 234 matching lines @@
 
     scoped_ptr<UpdatableTile> tile(UpdatableTile::create(updater()->createResource(resourceManager())));
     tile->managedResource()->setDimensions(m_tiler->tileSize(), m_textureFormat);
 
     UpdatableTile* addedTile = tile.get();
     m_tiler->addTile(tile.PassAs<LayerTilingData::Tile>(), i, 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;
 }
 
 void TiledLayer::setNeedsDisplayRect(const gfx::RectF& dirtyRect)
 {
     invalidateContentRect(layerRectToContentRect(dirtyRect));
     ContentsScalingLayer::setNeedsDisplayRect(dirtyRect);
 }
 
 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
     borderTexelOption = useLCDText ? LayerTilingData::NoBorderTexels : LayerTilingData::HasBorderTexels;
 #endif
     setBorderTexelOption(borderTexelOption);
 }
 
 void TiledLayer::invalidateContentRect(const gfx::Rect& contentRect)
 {
@@ skipping 189 matching lines @@
 
             tile->updateRect = sourceRect;
 
             if (sourceRect.IsEmpty())
                 continue;
 
             const gfx::Point anchor = m_tiler->tileRect(tile).origin();
 
             // 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)
                 occlusion->overdrawMetrics().didUpload(WebTransformationMatrix(), sourceRect, tile->opaqueRect());
 
         }
     }
 }
 
 namespace {
@@ skipping 258 matching lines @@
     gfx::Rect prepaintRect = visibleContentRect();
     prepaintRect.Inset(-m_tiler->tileSize().width() * prepaintColumns,
                        -m_tiler->tileSize().height() * prepaintRows);
     gfx::Rect contentRect(gfx::Point(), contentBounds());
     prepaintRect.Intersect(contentRect);
 
     return prepaintRect;
 }
 
 }  // namespace cc