diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 09:47:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 09:47:07 +0200 |
| commit | ef31021c3ec96a70777217f1f613f7d27d6f5a15 (patch) | |
| tree | b51453a9f663cf478c61d392188e8696e42846d9 /Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h | |
| parent | bbd3a98a7aeb4872d9bcb120306173ef975b3f8f (diff) | |
| parent | 8b2647154aa08a498624fa144d55fdefbeebe320 (diff) | |
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Iafbf406788fa3b89d01bc11c45c56727f058b189
Diffstat (limited to 'Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h index 16e4ebad0..548a95c29 100644 --- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h +++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h @@ -176,6 +176,7 @@ private: float m_debugBorderWidth; TextureMapperPlatformLayer* m_contentsLayer; + TextureMapperPlatformLayer* m_directLayer; FloatRect m_needsDisplayRect; GraphicsLayerAnimations m_animations; double m_animationStartTime; |