Commit eaeeda8e authored by falken@google.com's avatar falken@google.com

Generate documentation for experimental Font Settings Extension API.

It seems it needed to be added to api_page_generator.js. Also, renamed
experimental.fonts.json to experimental.fontSettings.json for consistency.

BUG=114148
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9689054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126853 0039d316-1c4b-4281-b951-d872f2087c98
parent 2b06b74c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DNS" file="extensions\api\experimental.dns.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DNS" file="extensions\api\experimental.dns.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental.downloads.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental.downloads.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_EXTENSIONS" file="extensions\api\experimental.extension.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_EXTENSIONS" file="extensions\api\experimental.extension.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTS" file="extensions\api\experimental.fonts.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTS" file="extensions\api\experimental.fontSettings.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental.infobars.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental.infobars.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI" file="extensions\api\experimental.input.ui.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI" file="extensions\api\experimental.input.ui.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental.input.virtualKeyboard.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental.input.virtualKeyboard.json" type="BINDATA" />
......
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
"script": { "script": {
"type": "string", "type": "string",
"enum": ["Arab", "Hang", "Hans", "Hant", "Hrkt"], "enum": ["Arab", "Hang", "Hans", "Hant", "Hrkt"],
"description": "The ISO 15924 script code for which the font setting should be retrieved. If omitted, the global script font setting is retrieved.", "description": "The ISO 15924 script code for which the font setting should be set. If omitted, the global script font setting is set.",
"optional": true "optional": true
}, },
"genericFamily": { "genericFamily": {
"type": "string", "type": "string",
"enum": ["standard", "sansserif", "serif", "fixed", "cursive", "fantasy"], "enum": ["standard", "sansserif", "serif", "fixed", "cursive", "fantasy"],
"description": "The CSS generic font family for which the font setting should be retrieved." "description": "The CSS generic font family for which the font setting should be set."
}, },
"fontName": { "fontName": {
"type": "string", "type": "string",
......
...@@ -242,6 +242,7 @@ on the following experimental APIs: ...@@ -242,6 +242,7 @@ on the following experimental APIs:
<a href="experimental.devtools.console.html">experimental.devtools.console</a></li><li> <a href="experimental.devtools.console.html">experimental.devtools.console</a></li><li>
<a href="experimental.downloads.html">experimental.downloads</a></li><li> <a href="experimental.downloads.html">experimental.downloads</a></li><li>
<a href="experimental.extension.html">experimental.extension</a></li><li> <a href="experimental.extension.html">experimental.extension</a></li><li>
<a href="experimental.fontSettings.html">experimental.fontSettings</a></li><li>
<a href="experimental.infobars.html">experimental.infobars</a></li><li> <a href="experimental.infobars.html">experimental.infobars</a></li><li>
<a href="experimental.keybinding.html">experimental.keybinding</a></li><li> <a href="experimental.keybinding.html">experimental.keybinding</a></li><li>
<a href="experimental.managedMode.html">experimental.managedMode</a></li><li> <a href="experimental.managedMode.html">experimental.managedMode</a></li><li>
......
...@@ -37,6 +37,7 @@ var MODULE_SCHEMAS = [ ...@@ -37,6 +37,7 @@ var MODULE_SCHEMAS = [
'../api/experimental.dns.json', '../api/experimental.dns.json',
'../api/experimental.downloads.json', '../api/experimental.downloads.json',
'../api/experimental.extension.json', '../api/experimental.extension.json',
'../api/experimental.fontSettings.json',
'../api/experimental.infobars.json', '../api/experimental.infobars.json',
'../api/experimental.input.ui.json', '../api/experimental.input.ui.json',
'../api/experimental.input.virtualKeyboard.json', '../api/experimental.input.virtualKeyboard.json',
......
...@@ -140,7 +140,7 @@ const char kWebKitFantasyFontFamilyMap[] = ...@@ -140,7 +140,7 @@ const char kWebKitFantasyFontFamilyMap[] =
"webkit.webprefs.fonts.fantasy"; "webkit.webprefs.fonts.fantasy";
// If these change, the corresponding enums in the extension API // If these change, the corresponding enums in the extension API
// experimental.fonts.json must also change. // experimental.fontSettings.json must also change.
// TODO(falken): Add all the scripts we should support. // TODO(falken): Add all the scripts we should support.
const char* const kWebKitScriptsForFontFamilyMaps[] = const char* const kWebKitScriptsForFontFamilyMaps[] =
{ "Arab", "Hang", "Hans", "Hant", "Hrkt" }; { "Arab", "Hang", "Hans", "Hant", "Hrkt" };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment