diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/android/layers')
3 files changed, 9 insertions, 8 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp index 1064388..d58c4ee 100644 --- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp @@ -27,7 +27,7 @@ #include "SkPaint.h" #include "SkPicture.h" #include "SkTypeface.h" -#include "Surface.h" +#include "rendering/Surface.h" #include "TilesManager.h" #include <wtf/CurrentTime.h> @@ -148,8 +148,8 @@ LayerAndroid::LayerAndroid(const LayerAndroid& layer) : Layer(layer), } if (hasAbsoluteChildren && !hasOnlyAbsoluteFollowers) { - Vector<LayerAndroid*> normalLayers; - Vector<LayerAndroid*> absoluteLayers; + WTF::Vector<LayerAndroid*> normalLayers; + WTF::Vector<LayerAndroid*> absoluteLayers; for (int i = 0; i < layer.countChildren(); i++) { LayerAndroid* child = layer.getChild(i); if (child->isPositionAbsolute() @@ -307,7 +307,7 @@ void LayerAndroid::addAnimation(PassRefPtr<AndroidAnimation> prpAnim) void LayerAndroid::removeAnimationsForProperty(AnimatedPropertyID property) { KeyframesMap::const_iterator end = m_animations.end(); - Vector<pair<String, int> > toDelete; + WTF::Vector<pair<String, int> > toDelete; for (KeyframesMap::const_iterator it = m_animations.begin(); it != end; ++it) { if ((it->second)->type() == property) toDelete.append(it->first); @@ -320,7 +320,7 @@ void LayerAndroid::removeAnimationsForProperty(AnimatedPropertyID property) void LayerAndroid::removeAnimationsForKeyframes(const String& name) { KeyframesMap::const_iterator end = m_animations.end(); - Vector<pair<String, int> > toDelete; + WTF::Vector<pair<String, int> > toDelete; for (KeyframesMap::const_iterator it = m_animations.begin(); it != end; ++it) { if ((it->second)->isNamed(name)) toDelete.append(it->first); @@ -704,7 +704,7 @@ void LayerAndroid::assignSurfaces(LayerMergeState* mergeState) int count = this->countChildren(); if (count > 0) { mergeState->depth++; - Vector <LayerAndroid*> sublayers; + WTF::Vector <LayerAndroid*> sublayers; for (int i = 0; i < count; i++) sublayers.append(getChild(i)); @@ -895,7 +895,7 @@ bool LayerAndroid::drawChildrenCanvas(SkCanvas* canvas, PaintStyle style) bool askScreenUpdate = false; int count = this->countChildren(); if (count > 0) { - Vector <LayerAndroid*> sublayers; + WTF::Vector <LayerAndroid*> sublayers; for (int i = 0; i < count; i++) sublayers.append(this->getChild(i)); diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h index 6c2e43d..b3518e9 100644 --- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h @@ -243,6 +243,7 @@ public: virtual bool isIFrame() const { return false; } virtual bool isIFrameContent() const { return false; } virtual bool isFixedBackground() const { return false; } + virtual bool isWebGL() const { return false; } bool isPositionFixed() const { return m_fixedPosition; } void setAbsolutePosition(bool isAbsolute) { m_isPositionAbsolute = isAbsolute; } diff --git a/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.h b/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.h index 346afe4..e0975ee 100644 --- a/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.h +++ b/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.h @@ -120,7 +120,7 @@ private: // The retiredTextures is used to communicate between UI thread and webcore // thread. Basically, GL textures are determined to retire in the webcore // thread, and really get deleted in the UI thread. - Vector<GLuint> m_retiredTextures; + WTF::Vector<GLuint> m_retiredTextures; android::Mutex m_retiredTexturesLock; GLuint createTextureFromImage(RenderSkinMediaButton::MediaButton buttonType); |