Fix a build break on EFL debug build
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 May 2015 04:46:07 +0000 (04:46 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 May 2015 04:46:07 +0000 (04:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=144654

Patch by Jinwoo Jeong <jw00.jeong@samsung.com> on 2015-05-06
Reviewed by Gyuyoung Kim.

No new tests, just build fix.

* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
(WebKit::CoordinatedGraphicsScene::paintToGraphicsContext):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp

index b4a3462..434a383 100644 (file)
@@ -1,3 +1,16 @@
+2015-05-06  Jinwoo Jeong  <jw00.jeong@samsung.com>
+
+        Fix a build break on EFL debug build
+        https://bugs.webkit.org/show_bug.cgi?id=144654
+
+        Reviewed by Gyuyoung Kim.
+
+        No new tests, just build fix.
+
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+        (WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
+        (WebKit::CoordinatedGraphicsScene::paintToGraphicsContext):
+
 2015-05-06  Daniel Bates  <dabates@apple.com>
 
         [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
index aeb1223..3b3fc77 100644 (file)
@@ -76,7 +76,6 @@ void CoordinatedGraphicsScene::paintToCurrentGLContext(const TransformationMatri
         static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
     }
 
-    ASSERT(m_textureMapper->accelerationMode() == TextureMapper::OpenGLMode);
     syncRemoteContent();
 
     adjustPositionForFixedLayers(contentPosition);
@@ -122,7 +121,6 @@ void CoordinatedGraphicsScene::paintToGraphicsContext(PlatformGraphicsContext* p
 {
     if (!m_textureMapper)
         m_textureMapper = TextureMapper::create();
-    ASSERT(m_textureMapper->accelerationMode() == TextureMapper::SoftwareMode);
     syncRemoteContent();
     TextureMapperLayer* layer = rootLayer();