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

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

Issue 2767243002: Sync SerializedScriptValue::wireFormatVersion with V8ScriptValueSerializer. (Closed)
Patch Set: Merge branch 'master' into ssv-version 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:
View unified diff | Download patch
OLDNEW
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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, 863 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent,
864 ProgressBarCompletion::LoadEvent); 864 ProgressBarCompletion::LoadEvent);
865 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, 865 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL,
866 ProgressBarCompletion::ResourcesBeforeDCL); 866 ProgressBarCompletion::ResourcesBeforeDCL);
867 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, 867 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded,
868 ProgressBarCompletion::DOMContentLoaded); 868 ProgressBarCompletion::DOMContentLoaded);
869 STATIC_ASSERT_ENUM( 869 STATIC_ASSERT_ENUM(
870 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames, 870 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames,
871 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); 871 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);
872 872
873 // This ensures that the version number published in
874 // WebSerializedScriptValueVersion.h matches the serializer's understanding.
875 // TODO(jbroman): Fix this to also account for the V8-side version. See
876 // https://crbug.com/704293.
873 static_assert(kSerializedScriptValueVersion == 877 static_assert(kSerializedScriptValueVersion ==
874 SerializedScriptValue::wireFormatVersion, 878 SerializedScriptValue::wireFormatVersion,
875 ""); 879 "Update WebSerializedScriptValueVersion.h.");
876 880
877 } // namespace blink 881 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698