diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:08:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:09:20 +0100 |
| commit | 061d58bc0fa016cfeed744fd3e4663460635d69b (patch) | |
| tree | ad9b8b032c803e1c9054c23fa1b7a0f1976bf98f /Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp | |
| parent | 470286ecfe79d59df14944e5b5d34630fc739391 (diff) | |
| download | qtwebkit-061d58bc0fa016cfeed744fd3e4663460635d69b.tar.gz | |
Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)
New snapshot that fixes various bugs
Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp b/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp index 2e4462734..e0c59054d 100644 --- a/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp +++ b/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp @@ -617,7 +617,6 @@ bool EwkViewImpl::createGLSurface(const IntSize& viewSize) if (!m_evasGL) { WARN("Failed to create Evas_GL, falling back to software mode."); m_isHardwareAccelerated = false; - layerTreeRenderer()->setAccelerationMode(TextureMapper::SoftwareMode); #if ENABLE(WEBGL) m_pageProxy->pageGroup()->preferences()->setWebGLEnabled(false); #endif @@ -643,7 +642,7 @@ bool EwkViewImpl::createGLSurface(const IntSize& viewSize) EVAS_GL_MULTISAMPLE_NONE }; - ASSERT(!m_evasGLSurface); + // Replaces if non-null, and frees existing surface after (OwnPtr). m_evasGLSurface = EvasGLSurface::create(evasGL(), &evasGLConfig, viewSize); if (!m_evasGLSurface) return false; |