Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / gfx / font_render_params_win.cc

diff --git a/src/ui/gfx/font_render_params_win.cc b/src/ui/gfx/font_render_params_win.cc
index a6fc618..70b19d2 100644 (file)
--- a/src/ui/gfx/font_render_params_win.cc
+++ b/src/ui/gfx/font_render_params_win.cc
@@ -59,7 +59,7 @@ class CachedFontRenderParams : public gfx::SingletonHwnd::Observer {
   virtual void OnWndProc(HWND hwnd,
                          UINT message,
                          WPARAM wparam,
-                         LPARAM lparam) OVERRIDE {
+                         LPARAM lparam) override {
     if (message == WM_SETTINGCHANGE) {
       params_.reset();
       gfx::SingletonHwnd::GetInstance()->RemoveObserver(this);
@@ -75,9 +75,9 @@ class CachedFontRenderParams : public gfx::SingletonHwnd::Observer {
 
 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
                                      std::string* family_out) {
-  // Customized font rendering settings are not supported, only defaults.
-  if (!query.is_empty() || family_out)
+  if (family_out)
     NOTIMPLEMENTED();
+  // Customized font rendering settings are not supported, only defaults.
   return CachedFontRenderParams::GetInstance()->GetParams(
       query.for_web_contents);
 }