| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, | 861 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, |
| 862 ProgressBarCompletion::LoadEvent); | 862 ProgressBarCompletion::LoadEvent); |
| 863 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, | 863 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, |
| 864 ProgressBarCompletion::ResourcesBeforeDCL); | 864 ProgressBarCompletion::ResourcesBeforeDCL); |
| 865 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, | 865 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, |
| 866 ProgressBarCompletion::DOMContentLoaded); | 866 ProgressBarCompletion::DOMContentLoaded); |
| 867 STATIC_ASSERT_ENUM( | 867 STATIC_ASSERT_ENUM( |
| 868 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames, | 868 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames, |
| 869 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); | 869 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); |
| 870 | 870 |
| 871 // This ensures that the version number published in | |
| 872 // WebSerializedScriptValueVersion.h matches the serializer's understanding. | |
| 873 // TODO(jbroman): Fix this to also account for the V8-side version. See | |
| 874 // https://crbug.com/704293. | |
| 875 static_assert(kSerializedScriptValueVersion == | |
| 876 SerializedScriptValue::wireFormatVersion, | |
| 877 "Update WebSerializedScriptValueVersion.h."); | |
| 878 | |
| 879 } // namespace blink | 871 } // namespace blink |
| OLD | NEW |