angler-fishThe Vulnerability History Project

Use removeFontFace to avoid resetting fontSelector.

      BUG=305885,336756
TEST=fast/css/font-face-remove.html, fast/css/font-face-html-as-svg.html

Review URL: https://codereview.chromium.org/82583005

git-svn-id: svn://svn.chromium.org/blink/trunk@167257 bbb929c8-8fbe-4397-9dbb-9b2b20218538
by Antoinette the Moth 2014-02-17 03:50:24 UTC
commit d7df607030c7f32637e41a1ad00d3fd2bf94db1b
Chromium VCC CVE-2014-1745
third_party/WebKit/LayoutTests/fast/css/cssom-modify-font-face-rule-expected.html
-13
third_party/WebKit/LayoutTests/fast/css/cssom-modify-font-face-rule.html
-22
third_party/WebKit/LayoutTests/fast/css/font-face-insertBefore-expected.html
-20
third_party/WebKit/LayoutTests/fast/css/font-face-insertBefore.html
-23
third_party/WebKit/Source/core/css/CSSFontSelector.cpp
-6
third_party/WebKit/Source/core/css/CSSFontSelector.h
-1
third_party/WebKit/Source/core/css/FontFaceCache.cpp
-7
third_party/WebKit/Source/core/css/FontFaceCache.h
-1
third_party/WebKit/Source/core/css/StyleSheetContents.cpp
+1 -43
third_party/WebKit/Source/core/css/StyleSheetContents.h
-3
third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp
+6 -5
third_party/WebKit/Source/core/dom/StyleEngine.cpp
+14 -24
third_party/WebKit/Source/core/dom/StyleEngine.h
+1 -5
third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp
+24 -11
third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.h
+2 -3
third_party/WebKit/Source/core/frame/Settings.cpp
+2 -2
third_party/WebKit/Source/core/frame/Settings.h
-1
third_party/WebKit/Source/core/frame/SettingsDelegate.h
-1
third_party/WebKit/Source/core/page/Page.cpp
+6 -28
third_party/WebKit/Source/core/page/Page.h
-2
third_party/WebKit/Source/core/testing/InternalSettings.cpp
+7 -8
third_party/WebKit/Source/platform/fonts/FontDescription.h
+4 -4
third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.cpp
-12
third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.h
+2 -2
third_party/WebKit/Source/web/WebSettingsImpl.cpp
-7
expand_less