diff options
| author | Steve Block <steveblock@google.com> | 2011-05-13 06:44:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 06:44:40 -0700 |
| commit | 08014c20784f3db5df3a89b73cce46037b77eb59 (patch) | |
| tree | 47749210d31e19e6e2f64036fa8fae2ad693476f /WebKit/win/FullscreenVideoController.h | |
| parent | 860220379e56aeb66424861ad602b07ee22b4055 (diff) | |
| parent | 4c3661f7918f8b3f139f824efb7855bedccb4c94 (diff) | |
| download | external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.zip external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.gz external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.bz2 | |
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Diffstat (limited to 'WebKit/win/FullscreenVideoController.h')
| -rw-r--r-- | WebKit/win/FullscreenVideoController.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebKit/win/FullscreenVideoController.h b/WebKit/win/FullscreenVideoController.h index 9ac8c69..6b56ab5 100644 --- a/WebKit/win/FullscreenVideoController.h +++ b/WebKit/win/FullscreenVideoController.h @@ -39,7 +39,7 @@ namespace WebCore { class GraphicsContext; #if USE(ACCELERATED_COMPOSITING) -class WKCACFLayer; +class PlatformCALayer; #endif } @@ -157,10 +157,10 @@ private: WebCore::IntPoint m_hudPosition; OwnPtr<WebCore::MediaPlayerPrivateFullscreenWindow> m_fullscreenWindow; #if USE(ACCELERATED_COMPOSITING) - RefPtr<WebCore::WKCACFLayer> m_rootChild; - class LayoutClient; - friend class LayoutClient; - OwnPtr<LayoutClient> m_layoutClient; + class LayerClient; + friend class LayerClient; + OwnPtr<LayerClient> m_layerClient; + RefPtr<WebCore::PlatformCALayer> m_rootChild; #endif HUDButton m_playPauseButton; |