[Coordinated Graphics] Test imported/blink/svg/custom/svg-image-layers-crash.html...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Jul 2016 15:23:53 +0000 (15:23 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Jul 2016 15:23:53 +0000 (15:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160078

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2016-07-23
Reviewed by Michael Catanzaro.

Source/WebCore:

This is a merge of Blink r155373.
https://chromiumcodereview.appspot.com/20789004

Disable accelerated compositing for SVGImage content layers. SVGImageChromeClient does not support it.

Fixes imported/blink/svg/custom/svg-image-layers-crash.html.

* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::dataChanged):

LayoutTests:

* platform/efl/TestExpectations: Remove imported/blink/svg/custom/svg-image-layers-crash.html.

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

LayoutTests/ChangeLog
LayoutTests/platform/efl/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/svg/graphics/SVGImage.cpp

index 79c632c..b108271 100644 (file)
@@ -1,3 +1,12 @@
+2016-07-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [Coordinated Graphics] Test imported/blink/svg/custom/svg-image-layers-crash.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=160078
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/efl/TestExpectations: Remove imported/blink/svg/custom/svg-image-layers-crash.html.
+
 2016-07-23  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r203641.
index 4220d17..1556cbb 100644 (file)
@@ -640,7 +640,6 @@ webkit.org/b/155875 svg/W3C-SVG-1.1/pservers-grad-01-b.svg [ Crash ]
 Bug(EFL) fast/dom/Window/property-access-on-cached-window-after-frame-removed.html [ Crash ]
 Bug(EFL) fast/selectors/querySelector-in-range-crash.html [ Crash ]
 Bug(EFL) http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html [ Crash ]
-Bug(EFL) imported/blink/svg/custom/svg-image-layers-crash.html [ Crash ]
 Bug(EFL) webaudio/decode-audio-data-basic.html [ Crash ]
 
 #////////////////////////////////////////////////////////////////////////////////////////
index 6751a52..6cb4cde 100644 (file)
@@ -1,3 +1,20 @@
+2016-07-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [Coordinated Graphics] Test imported/blink/svg/custom/svg-image-layers-crash.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=160078
+
+        Reviewed by Michael Catanzaro.
+
+        This is a merge of Blink r155373.
+        https://chromiumcodereview.appspot.com/20789004
+
+        Disable accelerated compositing for SVGImage content layers. SVGImageChromeClient does not support it.
+
+        Fixes imported/blink/svg/custom/svg-image-layers-crash.html.
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::dataChanged):
+
 2016-07-23  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r203641.
index ad88046..9c456b2 100644 (file)
@@ -395,6 +395,7 @@ bool SVGImage::dataChanged(bool allDataReceived)
         m_page->settings().setMediaEnabled(false);
         m_page->settings().setScriptEnabled(false);
         m_page->settings().setPluginsEnabled(false);
+        m_page->settings().setAcceleratedCompositingEnabled(false);
 
         Frame& frame = m_page->mainFrame();
         frame.setView(FrameView::create(frame));