svg/custom/svg-fonts-without-missing-glyph.xhtml fails after fonts/font-fallback...
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 9 Mar 2015 22:09:34 +0000 (22:09 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 9 Mar 2015 22:09:34 +0000 (22:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142470

Reviewed by Anders Carlsson.

Source/WebCore:

After each test, reset all internal settings.

Covered by svg/custom/svg-fonts-without-missing-glyph.xhtml

* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
* testing/InternalSettings.h:

LayoutTests:

* platform/mac/TestExpectations:

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

LayoutTests/ChangeLog
LayoutTests/platform/mac/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h

index 8d0d7fd..c023523 100644 (file)
@@ -1,3 +1,12 @@
+2015-03-09  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        svg/custom/svg-fonts-without-missing-glyph.xhtml fails after fonts/font-fallback-prefers-pictographs.html
+        https://bugs.webkit.org/show_bug.cgi?id=142470
+
+        Reviewed by Anders Carlsson.
+
+        * platform/mac/TestExpectations:
+
 2015-03-09  Benjamin Poulain  <benjamin@webkit.org>
 
         CSS JIT: add aliases between :nth-child()/:nth-last-child() and :first-child/:last-child
index 844ff9e..b0b8084 100644 (file)
@@ -1237,7 +1237,6 @@ webkit.org/b/140589 svg/W3C-SVG-1.1/text-text-06-t.svg [ Failure ]
 webkit.org/b/140589 svg/text/text-text-06-t.svg [ Failure ]
 webkit.org/b/137098 svg/text/text-hkern.svg [ Failure ]
 webkit.org/b/137100 svg/text/text-vkern.svg [ Failure ]
-webkit.org/b/142470 svg/custom/svg-fonts-without-missing-glyph.xhtml [ Pass Failure ]
 
 # Sometimes has an extra space at the end
 fast/forms/focus-selection-textarea.html [ Pass Failure ]
index d7e0281..9efd2fb 100644 (file)
@@ -1,3 +1,19 @@
+2015-03-09  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        svg/custom/svg-fonts-without-missing-glyph.xhtml fails after fonts/font-fallback-prefers-pictographs.html
+        https://bugs.webkit.org/show_bug.cgi?id=142470
+
+        Reviewed by Anders Carlsson.
+
+        After each test, reset all internal settings.
+
+        Covered by svg/custom/svg-fonts-without-missing-glyph.xhtml
+
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        * testing/InternalSettings.h:
+
 2015-03-09  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r181268.
index dbff5dc..5ba50b8 100644 (file)
@@ -90,6 +90,13 @@ InternalSettings::Backup::Backup(Settings& settings)
     , m_autoscrollForDragAndDropEnabled(settings.autoscrollForDragAndDropEnabled())
     , m_pluginReplacementEnabled(RuntimeEnabledFeatures::sharedFeatures().pluginReplacementEnabled())
     , m_shouldConvertPositionStyleOnCopy(settings.shouldConvertPositionStyleOnCopy())
+    , m_fontFallbackPrefersPictographs(settings.fontFallbackPrefersPictographs())
+    , m_backgroundShouldExtendBeyondPage(settings.backgroundShouldExtendBeyondPage())
+    , m_storageBlockingPolicy(settings.storageBlockingPolicy())
+    , m_scrollingTreeIncludesFrames(settings.scrollingTreeIncludesFrames())
+#if ENABLE(TOUCH_EVENTS)
+    , m_touchEventEmulationEnabled(settings.isTouchEventEmulationEnabled())
+#endif
 {
 }
 
@@ -146,6 +153,13 @@ void InternalSettings::Backup::restoreTo(Settings& settings)
     settings.setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
     settings.setAutoscrollForDragAndDropEnabled(m_autoscrollForDragAndDropEnabled);
     settings.setShouldConvertPositionStyleOnCopy(m_shouldConvertPositionStyleOnCopy);
+    settings.setFontFallbackPrefersPictographs(m_fontFallbackPrefersPictographs);
+    settings.setBackgroundShouldExtendBeyondPage(m_backgroundShouldExtendBeyondPage);
+    settings.setStorageBlockingPolicy(m_storageBlockingPolicy);
+    settings.setScrollingTreeIncludesFrames(m_scrollingTreeIncludesFrames);
+#if ENABLE(TOUCH_EVENTS)
+    settings.setTouchEventEmulationEnabled(m_touchEventEmulationEnabled);
+#endif
     RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
 }
 
@@ -486,4 +500,6 @@ void InternalSettings::setScrollingTreeIncludesFrames(bool enabled, ExceptionCod
     settings()->setScrollingTreeIncludesFrames(enabled);
 }
 
+// If you add to this list, make sure that you update the Backup class for test reproducability!
+
 }
index 9c01733..b78b81e 100644 (file)
@@ -34,6 +34,7 @@
 #include "FontGenericFamilies.h"
 #include "IntSize.h"
 #include "InternalSettingsGenerated.h"
+#include "SecurityOrigin.h"
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
@@ -87,6 +88,13 @@ public:
         bool m_autoscrollForDragAndDropEnabled;
         bool m_pluginReplacementEnabled;
         bool m_shouldConvertPositionStyleOnCopy;
+        bool m_fontFallbackPrefersPictographs;
+        bool m_backgroundShouldExtendBeyondPage;
+        SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy;
+        bool m_scrollingTreeIncludesFrames;
+#if ENABLE(TOUCH_EVENTS)
+        bool m_touchEventEmulationEnabled;
+#endif
     };
 
     static PassRefPtr<InternalSettings> create(Page* page)