| 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 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 835 STATIC_ASSERT_ENUM(WebSandboxFlags::Modals, SandboxModals); | 835 STATIC_ASSERT_ENUM(WebSandboxFlags::Modals, SandboxModals); |
| 836 | 836 |
| 837 STATIC_ASSERT_ENUM(LocalFrameClient::BeforeUnloadHandler, | 837 STATIC_ASSERT_ENUM(LocalFrameClient::BeforeUnloadHandler, |
| 838 WebFrameClient::BeforeUnloadHandler); | 838 WebFrameClient::BeforeUnloadHandler); |
| 839 STATIC_ASSERT_ENUM(LocalFrameClient::UnloadHandler, | 839 STATIC_ASSERT_ENUM(LocalFrameClient::UnloadHandler, |
| 840 WebFrameClient::UnloadHandler); | 840 WebFrameClient::UnloadHandler); |
| 841 | 841 |
| 842 STATIC_ASSERT_ENUM(WebFrameLoadType::Standard, FrameLoadTypeStandard); | 842 STATIC_ASSERT_ENUM(WebFrameLoadType::Standard, FrameLoadTypeStandard); |
| 843 STATIC_ASSERT_ENUM(WebFrameLoadType::BackForward, FrameLoadTypeBackForward); | 843 STATIC_ASSERT_ENUM(WebFrameLoadType::BackForward, FrameLoadTypeBackForward); |
| 844 STATIC_ASSERT_ENUM(WebFrameLoadType::Reload, FrameLoadTypeReload); | 844 STATIC_ASSERT_ENUM(WebFrameLoadType::Reload, FrameLoadTypeReload); |
| 845 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadMainResource, | |
| 846 FrameLoadTypeReloadMainResource); | |
| 847 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem, | 845 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem, |
| 848 FrameLoadTypeReplaceCurrentItem); | 846 FrameLoadTypeReplaceCurrentItem); |
| 849 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame, | 847 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame, |
| 850 FrameLoadTypeInitialInChildFrame); | 848 FrameLoadTypeInitialInChildFrame); |
| 851 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad, | 849 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad, |
| 852 FrameLoadTypeInitialHistoryLoad); | 850 FrameLoadTypeInitialHistoryLoad); |
| 853 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, | 851 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, |
| 854 FrameLoadTypeReloadBypassingCache); | 852 FrameLoadTypeReloadBypassingCache); |
| 855 | 853 |
| 856 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove); | 854 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 872 | 870 |
| 873 // This ensures that the version number published in | 871 // This ensures that the version number published in |
| 874 // WebSerializedScriptValueVersion.h matches the serializer's understanding. | 872 // WebSerializedScriptValueVersion.h matches the serializer's understanding. |
| 875 // TODO(jbroman): Fix this to also account for the V8-side version. See | 873 // TODO(jbroman): Fix this to also account for the V8-side version. See |
| 876 // https://crbug.com/704293. | 874 // https://crbug.com/704293. |
| 877 static_assert(kSerializedScriptValueVersion == | 875 static_assert(kSerializedScriptValueVersion == |
| 878 SerializedScriptValue::wireFormatVersion, | 876 SerializedScriptValue::wireFormatVersion, |
| 879 "Update WebSerializedScriptValueVersion.h."); | 877 "Update WebSerializedScriptValueVersion.h."); |
| 880 | 878 |
| 881 } // namespace blink | 879 } // namespace blink |
| OLD | NEW |