diff options
| -rw-r--r-- | Source/WebCore/html/shadow/MediaControlRootElement.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/page/FrameView.cpp | 6 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseTile.cpp | 7 |
3 files changed, 15 insertions, 2 deletions
diff --git a/Source/WebCore/html/shadow/MediaControlRootElement.cpp b/Source/WebCore/html/shadow/MediaControlRootElement.cpp index e063c4c..434e062 100644 --- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp +++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp @@ -412,8 +412,10 @@ void MediaControlRootElement::changedVolume() void MediaControlRootElement::enteredFullscreen() { if (m_mediaElement->movieLoadType() == MediaPlayer::LiveStream || m_mediaElement->movieLoadType() == MediaPlayer::StoredStream) { +#if !PLATFORM(ANDROID) m_seekBackButton->hide(); m_seekForwardButton->hide(); +#endif } else m_rewindButton->hide(); } @@ -424,8 +426,10 @@ void MediaControlRootElement::exitedFullscreen() // when exiting fullscreen. // FIXME: Clarify naming of show/hide <http://webkit.org/b/58157> m_rewindButton->show(); +#if !PLATFORM(ANDROID) m_seekBackButton->show(); m_seekForwardButton->show(); +#endif } void MediaControlRootElement::showVolumeSlider() diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index ee6bd6b..49a7d0c 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -652,6 +652,12 @@ bool FrameView::syncCompositingStateForThisFrame() // the fullScreenRenderer's graphicsLayer here: Document* document = m_frame->document(); if (isDocumentRunningFullScreenAnimation(document)) { +#if PLATFORM(ANDROID) + // We don't create an extra layer for the full screen video. + if (!document->fullScreenRenderer()->layer() + || !document->fullScreenRenderer()->layer()->backing()) + return true; +#endif RenderLayerBacking* backing = document->fullScreenRenderer()->layer()->backing(); if (GraphicsLayer* fullScreenLayer = backing->graphicsLayer()) fullScreenLayer->syncCompositingState(); diff --git a/Source/WebCore/platform/graphics/android/BaseTile.cpp b/Source/WebCore/platform/graphics/android/BaseTile.cpp index 93d00bd..2963ca7 100644 --- a/Source/WebCore/platform/graphics/android/BaseTile.cpp +++ b/Source/WebCore/platform/graphics/android/BaseTile.cpp @@ -75,11 +75,11 @@ BaseTile::BaseTile(bool isLayerTile) m_currentDirtyAreaIndex = 0; // For EglImage Mode, the internal buffer should be 2. - // And for Async Surface Texture mode, this is 3. + // For Surface Texture mode, we only need one. if (TilesManager::instance()->getSharedTextureMode() == EglImageMode) m_maxBufferNumber = 2; else - m_maxBufferNumber = 3; + m_maxBufferNumber = 1; m_dirtyArea = new SkRegion[m_maxBufferNumber]; m_fullRepaint = new bool[m_maxBufferNumber]; @@ -355,6 +355,9 @@ void BaseTile::paintBitmap() bool surfaceTextureMode = textureInfo->getSharedTextureMode() == SurfaceTextureMode; + if (surfaceTextureMode) + fullRepaint = true; + while (!fullRepaint && !cliperator.done()) { SkRect realTileRect; SkRect dirtyRect; |