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

Side by Side Diff: sky/engine/web/WebSettingsImpl.cpp

Issue 762723002: Remove ENABLE(COMPOSITOR). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « sky/engine/public/web/WebWidgetClient.h ('k') | sky/engine/web/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 , m_showPaintRects(false) 45 , m_showPaintRects(false)
46 , m_renderVSyncNotificationEnabled(false) 46 , m_renderVSyncNotificationEnabled(false)
47 , m_deferredImageDecodingEnabled(false) 47 , m_deferredImageDecodingEnabled(false)
48 , m_supportDeprecatedTargetDensityDPI(false) 48 , m_supportDeprecatedTargetDensityDPI(false)
49 , m_shrinksViewportContentToFit(false) 49 , m_shrinksViewportContentToFit(false)
50 , m_mainFrameResizesAreOrientationChanges(false) 50 , m_mainFrameResizesAreOrientationChanges(false)
51 { 51 {
52 ASSERT(settings); 52 ASSERT(settings);
53 } 53 }
54 54
55 // FIXME(sky): Remove
55 bool WebSettingsImpl::compositorIsEnabled() const 56 bool WebSettingsImpl::compositorIsEnabled() const
56 { 57 {
57 #if ENABLE(COMPOSITOR)
58 return true;
59 #else
60 return false; 58 return false;
61 #endif
62 } 59 }
63 60
64 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript) 61 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s cript)
65 { 62 {
66 if (m_settings->genericFontFamilySettings().updateStandard(font, script)) 63 if (m_settings->genericFontFamilySettings().updateStandard(font, script))
67 m_settings->notifyGenericFontFamilyChange(); 64 m_settings->notifyGenericFontFamilyChange();
68 } 65 }
69 66
70 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt) 67 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri pt)
71 { 68 {
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 { 393 {
397 m_mainFrameResizesAreOrientationChanges = enabled; 394 m_mainFrameResizesAreOrientationChanges = enabled;
398 } 395 }
399 396
400 void WebSettingsImpl::setV8CacheOptions(V8CacheOptions options) 397 void WebSettingsImpl::setV8CacheOptions(V8CacheOptions options)
401 { 398 {
402 m_settings->setV8CacheOptions(static_cast<blink::V8CacheOptions>(options)); 399 m_settings->setV8CacheOptions(static_cast<blink::V8CacheOptions>(options));
403 } 400 }
404 401
405 } // namespace blink 402 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/public/web/WebWidgetClient.h ('k') | sky/engine/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698