Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Pawel Hajdan (phajdan.jr@chromium.org) | 3 * Copyright (C) 2010 Pawel Hajdan (phajdan.jr@chromium.org) |
| 4 * Copyright (C) 2012 Apple Inc. All Rights Reserved. | 4 * Copyright (C) 2012 Apple Inc. All Rights Reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions are | 7 * modification, are permitted provided that the following conditions are |
| 8 * met: | 8 * met: |
| 9 * | 9 * |
| 10 * * Redistributions of source code must retain the above copyright | 10 * * Redistributions of source code must retain the above copyright |
| (...skipping 1615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1626 else if (key == "WebKitEnableCaretBrowsing") | 1626 else if (key == "WebKitEnableCaretBrowsing") |
| 1627 prefs->caretBrowsingEnabled = cppVariantToBool(value); | 1627 prefs->caretBrowsingEnabled = cppVariantToBool(value); |
| 1628 else if (key == "WebKitAllowDisplayingInsecureContent") | 1628 else if (key == "WebKitAllowDisplayingInsecureContent") |
| 1629 prefs->allowDisplayOfInsecureContent = cppVariantToBool(value); | 1629 prefs->allowDisplayOfInsecureContent = cppVariantToBool(value); |
| 1630 else if (key == "WebKitAllowRunningInsecureContent") | 1630 else if (key == "WebKitAllowRunningInsecureContent") |
| 1631 prefs->allowRunningOfInsecureContent = cppVariantToBool(value); | 1631 prefs->allowRunningOfInsecureContent = cppVariantToBool(value); |
| 1632 else if (key == "WebKitCSSCustomFilterEnabled") | 1632 else if (key == "WebKitCSSCustomFilterEnabled") |
| 1633 prefs->cssCustomFilterEnabled = cppVariantToBool(value); | 1633 prefs->cssCustomFilterEnabled = cppVariantToBool(value); |
| 1634 else if (key == "WebKitShouldRespectImageOrientation") | 1634 else if (key == "WebKitShouldRespectImageOrientation") |
| 1635 prefs->shouldRespectImageOrientation = cppVariantToBool(value); | 1635 prefs->shouldRespectImageOrientation = cppVariantToBool(value); |
| 1636 else if (key == "WebKitAcceleratedCompositingEnabled") | |
|
Stephen White
2013/05/17 19:16:23
I don't think there's any need to plumb this throu
| |
| 1637 prefs->acceleratedCompositingEnabled = cppVariantToBool(value); | |
| 1636 else if (key == "WebKitWebAudioEnabled") | 1638 else if (key == "WebKitWebAudioEnabled") |
| 1637 WEBKIT_ASSERT(cppVariantToBool(value)); | 1639 WEBKIT_ASSERT(cppVariantToBool(value)); |
| 1638 else { | 1640 else { |
| 1639 string message("Invalid name for preference: "); | 1641 string message("Invalid name for preference: "); |
| 1640 message.append(key); | 1642 message.append(key); |
| 1641 printErrorMessage(message); | 1643 printErrorMessage(message); |
| 1642 } | 1644 } |
| 1643 m_delegate->applyPreferences(); | 1645 m_delegate->applyPreferences(); |
| 1644 } | 1646 } |
| 1645 | 1647 |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2036 result->setNull(); | 2038 result->setNull(); |
| 2037 } | 2039 } |
| 2038 | 2040 |
| 2039 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result) | 2041 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result) |
| 2040 { | 2042 { |
| 2041 m_pointerLockPlannedResult = PointerLockWillFailSync; | 2043 m_pointerLockPlannedResult = PointerLockWillFailSync; |
| 2042 result->setNull(); | 2044 result->setNull(); |
| 2043 } | 2045 } |
| 2044 | 2046 |
| 2045 } | 2047 } |
| OLD | NEW |