Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1302)

Unified Diff: Source/core/inspector/InspectorOverlay.cpp

Issue 100653002: Introduce GenericFontFamilySettings. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added missing PLATFORM_EXPORT Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/FontBuilder.cpp ('k') | Source/core/page/Settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorOverlay.cpp
diff --git a/Source/core/inspector/InspectorOverlay.cpp b/Source/core/inspector/InspectorOverlay.cpp
index 917771fcd00b513b78585e49704bf4c240b6f758..160c730958c07dcac9a75d33e3db75fc63a7590c 100644
--- a/Source/core/inspector/InspectorOverlay.cpp
+++ b/Source/core/inspector/InspectorOverlay.cpp
@@ -597,12 +597,12 @@ Page* InspectorOverlay::overlayPage()
Settings& settings = m_page->settings();
Settings& overlaySettings = m_overlayPage->settings();
- overlaySettings.setStandardFontFamily(settings.standardFontFamily());
- overlaySettings.setSerifFontFamily(settings.serifFontFamily());
- overlaySettings.setSansSerifFontFamily(settings.sansSerifFontFamily());
- overlaySettings.setCursiveFontFamily(settings.cursiveFontFamily());
- overlaySettings.setFantasyFontFamily(settings.fantasyFontFamily());
- overlaySettings.setPictographFontFamily(settings.pictographFontFamily());
+ overlaySettings.genericFontFamilySettings().setStandard(settings.genericFontFamilySettings().standard());
+ overlaySettings.genericFontFamilySettings().setSerif(settings.genericFontFamilySettings().serif());
+ overlaySettings.genericFontFamilySettings().setSansSerif(settings.genericFontFamilySettings().sansSerif());
+ overlaySettings.genericFontFamilySettings().setCursive(settings.genericFontFamilySettings().cursive());
+ overlaySettings.genericFontFamilySettings().setFantasy(settings.genericFontFamilySettings().fantasy());
+ overlaySettings.genericFontFamilySettings().setPictograph(settings.genericFontFamilySettings().pictograph());
overlaySettings.setMinimumFontSize(settings.minimumFontSize());
overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize());
overlaySettings.setMediaEnabled(false);
« no previous file with comments | « Source/core/css/resolver/FontBuilder.cpp ('k') | Source/core/page/Settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698