From 30e931f10b33637764ad989593b44da0becc9be6 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Mar 2015 12:31:52 +0800 Subject: [PATCH 1/2] Revert "The "subpixel-font-scaling" option is removed" This reverts commit 98fbe5127b44a2cdbe0514f9205891c26ae588b8. --- atom/browser/native_window.cc | 1 + atom/common/options_switches.cc | 1 + atom/common/options_switches.h | 1 + atom/renderer/atom_renderer_client.cc | 2 ++ docs/api/browser-window.md | 1 + 5 files changed, 6 insertions(+) diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 423d626dba5c..df36bfa8570a 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -77,6 +77,7 @@ namespace { const char* kWebRuntimeFeatures[] = { switches::kExperimentalFeatures, switches::kExperimentalCanvasFeatures, + switches::kSubpixelFontScaling, switches::kOverlayScrollbars, switches::kOverlayFullscreenVideo, switches::kSharedWorker, diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc index 51ec91aa5163..f67a6456964c 100644 --- a/atom/common/options_switches.cc +++ b/atom/common/options_switches.cc @@ -78,6 +78,7 @@ const char kType[] = "type"; // Web runtime features. const char kExperimentalFeatures[] = "experimental-features"; const char kExperimentalCanvasFeatures[] = "experimental-canvas-features"; +const char kSubpixelFontScaling[] = "subpixel-font-scaling"; const char kOverlayScrollbars[] = "overlay-scrollbars"; const char kOverlayFullscreenVideo[] = "overlay-fullscreen-video"; const char kSharedWorker[] = "shared-worker"; diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h index 4184d9208553..967f62638733 100644 --- a/atom/common/options_switches.h +++ b/atom/common/options_switches.h @@ -44,6 +44,7 @@ extern const char kType[]; extern const char kExperimentalFeatures[]; extern const char kExperimentalCanvasFeatures[]; +extern const char kSubpixelFontScaling[]; extern const char kOverlayScrollbars[]; extern const char kOverlayFullscreenVideo[]; extern const char kSharedWorker[]; diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc index 01daaa655fcb..cc48bc0481d1 100644 --- a/atom/renderer/atom_renderer_client.cc +++ b/atom/renderer/atom_renderer_client.cc @@ -168,6 +168,8 @@ void AtomRendererClient::EnableWebRuntimeFeatures() { blink::WebRuntimeFeatures::enableExperimentalFeatures(b); if (IsSwitchEnabled(command_line, switches::kExperimentalCanvasFeatures, &b)) blink::WebRuntimeFeatures::enableExperimentalCanvasFeatures(b); + if (IsSwitchEnabled(command_line, switches::kSubpixelFontScaling, &b)) + blink::WebRuntimeFeatures::enableSubpixelFontScaling(b); if (IsSwitchEnabled(command_line, switches::kOverlayScrollbars, &b)) blink::WebRuntimeFeatures::enableOverlayScrollbars(b); if (IsSwitchEnabled(command_line, switches::kOverlayFullscreenVideo, &b)) diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index 916a28b72387..a8456b5767de 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -88,6 +88,7 @@ You can also create a window without chrome by using under current working directory. * `experimental-features` Boolean * `experimental-canvas-features` Boolean + * `subpixel-font-scaling` Boolean * `overlay-scrollbars` Boolean * `overlay-fullscreen-video` Boolean * `shared-worker` Boolean From 2a4b04bac6eba40795ddafcc737f3ebdc8b4b5cb Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Mar 2015 16:00:03 +0800 Subject: [PATCH 2/2] Update libchromiumcontent --- script/lib/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/config.py b/script/lib/config.py index 01f849d6ca68..7ed3bd65999d 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -4,7 +4,7 @@ import platform import sys BASE_URL = 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '78ddaee2158886da53d0801db572be38230fd814' +LIBCHROMIUMCONTENT_COMMIT = '26dd65a62e35aa98b25c10cbfc00f1a621fd4c4b' ARCH = { 'cygwin': '32bit',