mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #8542 from yamgent/webpref-numeric

Browse source 
Fix webpreferences not accepting numeric options
This commit is contained in:
Kevin Sawicki 2017-02-07 09:15:55 -08:00 • committed by GitHub
commit c3c5470a7c
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
atom/browser/web_contents_preferences.cc
View file

@ -254,15 +254,28 @@ void WebContentsPreferences::OverrideWebkitPrefs(
prefs->fantasy_font_family_map[content::kCommonScript] = font; prefs->fantasy_font_family_map[content::kCommonScript] = font;
} }
int size; int size;
if (self->web_preferences_.GetInteger("defaultFontSize", &size)) if (self->GetInteger("defaultFontSize", &size))
prefs->default_font_size = size; prefs->default_font_size = size;
if (self->web_preferences_.GetInteger("defaultMonospaceFontSize", &size)) if (self->GetInteger("defaultMonospaceFontSize", &size))
prefs->default_fixed_font_size = size; prefs->default_fixed_font_size = size;
if (self->web_preferences_.GetInteger("minimumFontSize", &size)) if (self->GetInteger("minimumFontSize", &size))
prefs->minimum_font_size = size; prefs->minimum_font_size = size;
std::string encoding; std::string encoding;
if (self->web_preferences_.GetString("defaultEncoding", &encoding)) if (self->web_preferences_.GetString("defaultEncoding", &encoding))
prefs->default_encoding = encoding; prefs->default_encoding = encoding;
} }
bool WebContentsPreferences::GetInteger(const std::string& attributeName,
int* intValue) {
// if it is already an integer, no conversion needed
if (web_preferences_.GetInteger(attributeName, intValue))
return true;
base::string16 stringValue;
if (web_preferences_.GetString(attributeName, &stringValue))
return base::StringToInt(stringValue, intValue);
return false;
}
} // namespace atom } // namespace atom

4
atom/browser/web_contents_preferences.h
View file

@ -5,6 +5,7 @@
#ifndef ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_ #ifndef ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
#define ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_ #define ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
#include <string>
#include <vector> #include <vector>
#include "base/values.h" #include "base/values.h"
@ -60,6 +61,9 @@ class WebContentsPreferences
content::WebContents* web_contents_; content::WebContents* web_contents_;
base::DictionaryValue web_preferences_; base::DictionaryValue web_preferences_;
// Get preferences value as integer possibly coercing it from a string
bool GetInteger(const std::string& attributeName, int* intValue);
DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences); DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
}; };