diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 18:54:29 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 18:54:29 +0000 |
| commit | ba0d6ecd82955c7511b2394abcaac4f57be2f1c0 (patch) | |
| tree | 89109273c133a8364c9937f4ebd44307accb5a7c /ui | |
| parent | e3681f0af0c83faf2ce843714cd3d5037617e2b1 (diff) | |
| download | chromium_src-ba0d6ecd82955c7511b2394abcaac4f57be2f1c0.zip chromium_src-ba0d6ecd82955c7511b2394abcaac4f57be2f1c0.tar.gz chromium_src-ba0d6ecd82955c7511b2394abcaac4f57be2f1c0.tar.bz2 | |
Remove check for WEBLAYERTREEVIEW_HAS_INITIALIZE, this has rolled in to chromium for weeks
This #define was set in WebKit r108883 which now exists in trunk and the M19 branch, so the guard isn't needed any more.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/10023004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/compositor/compositor.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/gfx/compositor/compositor.cc b/ui/gfx/compositor/compositor.cc index 342ad73..965d1cb 100644 --- a/ui/gfx/compositor/compositor.cc +++ b/ui/gfx/compositor/compositor.cc @@ -126,11 +126,7 @@ Compositor::Compositor(CompositorDelegate* delegate, settings.perTilePainting = command_line->HasSwitch(switches::kUIEnablePerTilePainting); -#if defined(WEBLAYERTREEVIEW_HAS_INITIALIZE) host_.initialize(this, root_web_layer_, settings); -#else - host_ = WebKit::WebLayerTreeView::create(this, root_web_layer_, settings); -#endif root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f)); WidgetSizeChanged(size_); } |