third_party/WebKit/Source/web/AssertMatchingEnums.cpp - Issue 2772753002: Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior

Side by Side Diff: third_party/WebKit/Source/web/AssertMatchingEnums.cpp

Issue 2772753002: Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior (Closed)

Patch Set: remove Reload Created 3 years, 9 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:

« third_party/WebKit/Source/core/loader/NavigationScheduler.cpp ('K') | « third_party/WebKit/Source/core/loader/NavigationScheduler.cpp ('k') | third_party/WebKit/public/web/WebFrameLoadType.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 823 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
834 SandboxPropagatesToAuxiliaryBrowsingContexts);	834 SandboxPropagatesToAuxiliaryBrowsingContexts);

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);

845 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadMainResource,	844 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadMainResource,

846 FrameLoadTypeReloadMainResource);	845 FrameLoadTypeReloadMainResource);

847 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem,	846 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem,

848 FrameLoadTypeReplaceCurrentItem);	847 FrameLoadTypeReplaceCurrentItem);

849 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame,	848 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame,

850 FrameLoadTypeInitialInChildFrame);	849 FrameLoadTypeInitialInChildFrame);

851 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad,	850 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad,

852 FrameLoadTypeInitialHistoryLoad);	851 FrameLoadTypeInitialHistoryLoad);

853 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache,	852 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache,

854 FrameLoadTypeReloadBypassingCache);	853 FrameLoadTypeReloadBypassingCache);

(...skipping 13 matching lines...) Expand all Loading...
868 ProgressBarCompletion::DOMContentLoaded);	867 ProgressBarCompletion::DOMContentLoaded);

869 STATIC_ASSERT_ENUM(	868 STATIC_ASSERT_ENUM(

870 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames,	869 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames,

871 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);	870 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);

872	871

873 static_assert(kSerializedScriptValueVersion ==	872 static_assert(kSerializedScriptValueVersion ==

874 SerializedScriptValue::wireFormatVersion,	873 SerializedScriptValue::wireFormatVersion,

875 "");	874 "");

876	875

877 } // namespace blink	876 } // namespace blink

OLD	NEW