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

Unified Diff: ui/gfx/compositor/compositor_cc.h

Issue 8360018: Revert 106606 - Use WebKit compositor in ui::Layer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/compositor/compositor.gyp ('k') | ui/gfx/compositor/compositor_cc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor_cc.h
===================================================================
--- ui/gfx/compositor/compositor_cc.h (revision 106614)
+++ ui/gfx/compositor/compositor_cc.h (working copy)
@@ -1,82 +0,0 @@
-// Copyright (c) 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.
-
-#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_
-#define UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_
-#pragma once
-
-#include "base/compiler_specific.h"
-#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/size.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebLayer.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebLayerClient.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebLayerTreeView.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebLayerTreeViewClient.h"
-
-namespace gfx {
-class Rect;
-}
-
-namespace ui {
-
-class COMPOSITOR_EXPORT TextureCC : public Texture {
- public:
- TextureCC();
-
- // Texture implementation.
- virtual void SetCanvas(const SkCanvas& canvas,
- const gfx::Point& origin,
- const gfx::Size& overall_size) OVERRIDE;
-
- virtual void Draw(const ui::TextureDrawParams& params,
- const gfx::Rect& clip_bounds_in_texture) OVERRIDE;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TextureCC);
-};
-
-class COMPOSITOR_EXPORT CompositorCC : public Compositor,
- public WebKit::WebLayerTreeViewClient,
- public WebKit::WebLayerClient {
- public:
- CompositorCC(CompositorDelegate* delegate,
- gfx::AcceleratedWidget widget,
- const gfx::Size& size);
- virtual ~CompositorCC();
-
- static void InitializeThread();
- static void TerminateThread();
-
- protected:
- // Compositor implementation.
- virtual Texture* CreateTexture() OVERRIDE;
- virtual void Blur(const gfx::Rect& bounds) OVERRIDE;
- virtual void ScheduleDraw() OVERRIDE;
- virtual void OnNotifyStart(bool clear) OVERRIDE;
- virtual void OnNotifyEnd() OVERRIDE;
- virtual void OnWidgetSizeChanged() OVERRIDE;
- virtual void OnRootLayerChanged() OVERRIDE;
- virtual void DrawTree() OVERRIDE;
-
- // WebLayerTreeViewClient implementation.
- virtual void animateAndLayout(double frameBeginTime) OVERRIDE;
- virtual void applyScrollDelta(const WebKit::WebSize&) OVERRIDE;
- virtual WebKit::WebGraphicsContext3D* createContext3D() OVERRIDE;
- virtual void didRebindGraphicsContext(bool success) OVERRIDE;
- virtual void scheduleComposite() OVERRIDE;
-
- // WebLayerClient implementation.
- virtual void notifyNeedsComposite() OVERRIDE;
-
- private:
- gfx::AcceleratedWidget widget_;
- WebKit::WebLayer root_web_layer_;
- WebKit::WebLayerTreeView host_;
-
- DISALLOW_COPY_AND_ASSIGN(CompositorCC);
-};
-
-} // namespace ui
-
-#endif // UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_
« no previous file with comments | « ui/gfx/compositor/compositor.gyp ('k') | ui/gfx/compositor/compositor_cc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698