diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
| commit | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (patch) | |
| tree | d9c68d1cca0b3e352f1e438561f3e504e641a08f /Source/WebKit/blackberry/Api/BackingStore.cpp | |
| parent | d0424a769059c84ae20beb3c217812792ea6726b (diff) | |
| download | qtwebkit-6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2.tar.gz | |
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)
New snapshot with various build fixes
Diffstat (limited to 'Source/WebKit/blackberry/Api/BackingStore.cpp')
| -rw-r--r-- | Source/WebKit/blackberry/Api/BackingStore.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/WebKit/blackberry/Api/BackingStore.cpp b/Source/WebKit/blackberry/Api/BackingStore.cpp index d626fec30..7ad6ce859 100644 --- a/Source/WebKit/blackberry/Api/BackingStore.cpp +++ b/Source/WebKit/blackberry/Api/BackingStore.cpp @@ -28,6 +28,7 @@ #include "FrameView.h" #include "GraphicsContext.h" #include "InspectorController.h" +#include "InspectorInstrumentation.h" #include "Page.h" #include "SurfacePool.h" #include "WebPage.h" @@ -235,6 +236,16 @@ BackingStorePrivate::~BackingStorePrivate() pthread_mutex_destroy(&m_mutex); } +void BackingStorePrivate::instrumentBeginFrame() +{ + WebCore::InspectorInstrumentation::didBeginFrame(WebPagePrivate::core(m_webPage)); +} + +void BackingStorePrivate::instrumentCancelFrame() +{ + WebCore::InspectorInstrumentation::didCancelFrame(WebPagePrivate::core(m_webPage)); +} + bool BackingStorePrivate::shouldDirectRenderingToWindow() const { // Direct rendering doesn't work with OpenGL compositing code paths due to @@ -349,9 +360,14 @@ void BackingStorePrivate::resumeScreenAndBackingStoreUpdates(BackingStore::Resum --m_suspendScreenUpdates; BlackBerry::Platform::userInterfaceThreadMessageClient()->syncToCurrentMessage(); +#if USE(ACCELERATED_COMPOSITING) + // This will also blit since we set the OSDS flag above. + m_webPage->d->commitRootLayerIfNeeded(); +#else // Do some blitting if necessary. if ((op == BackingStore::Blit || op == BackingStore::RenderAndBlit) && !shouldDirectRenderingToWindow()) blitVisibleContents(); +#endif } void BackingStorePrivate::repaint(const Platform::IntRect& windowRect, |