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

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

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months 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/web/WebSettingsImpl.h ('k') | sky/engine/web/tests/RunAllTests.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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 void WebSettingsImpl::setSmartInsertDeleteEnabled(bool enabled) 346 void WebSettingsImpl::setSmartInsertDeleteEnabled(bool enabled)
347 { 347 {
348 m_settings->setSmartInsertDeleteEnabled(enabled); 348 m_settings->setSmartInsertDeleteEnabled(enabled);
349 } 349 }
350 350
351 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled) 351 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled)
352 { 352 {
353 m_mainFrameResizesAreOrientationChanges = enabled; 353 m_mainFrameResizesAreOrientationChanges = enabled;
354 } 354 }
355 355
356 void WebSettingsImpl::setV8CacheOptions(V8CacheOptions options)
357 {
358 m_settings->setV8CacheOptions(static_cast<blink::V8CacheOptions>(options));
359 }
360
361 } // namespace blink 356 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/web/WebSettingsImpl.h ('k') | sky/engine/web/tests/RunAllTests.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698