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

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

Issue 1843663005: Change bool ignoreCache to WebFrameLoadType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 22 matching lines...) Expand all
33 33
34 #include "bindings/core/v8/SerializedScriptValue.h" 34 #include "bindings/core/v8/SerializedScriptValue.h"
35 #include "core/dom/AXObjectCache.h" 35 #include "core/dom/AXObjectCache.h"
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "core/dom/IconURL.h" 37 #include "core/dom/IconURL.h"
38 #include "core/editing/SelectionType.h" 38 #include "core/editing/SelectionType.h"
39 #include "core/editing/TextAffinity.h" 39 #include "core/editing/TextAffinity.h"
40 #include "core/editing/markers/DocumentMarker.h" 40 #include "core/editing/markers/DocumentMarker.h"
41 #include "core/fileapi/FileError.h" 41 #include "core/fileapi/FileError.h"
42 #include "core/frame/Frame.h" 42 #include "core/frame/Frame.h"
43 #include "core/frame/FrameTypes.h"
43 #include "core/frame/Settings.h" 44 #include "core/frame/Settings.h"
44 #include "core/frame/csp/ContentSecurityPolicy.h" 45 #include "core/frame/csp/ContentSecurityPolicy.h"
45 #include "core/html/HTMLFormElement.h" 46 #include "core/html/HTMLFormElement.h"
46 #include "core/html/HTMLInputElement.h" 47 #include "core/html/HTMLInputElement.h"
47 #include "core/html/HTMLMediaElement.h" 48 #include "core/html/HTMLMediaElement.h"
48 #include "core/html/shadow/TextControlInnerElements.h" 49 #include "core/html/shadow/TextControlInnerElements.h"
49 #include "core/layout/compositing/CompositedSelectionBound.h" 50 #include "core/layout/compositing/CompositedSelectionBound.h"
50 #include "core/loader/FrameLoaderClient.h" 51 #include "core/loader/FrameLoaderClient.h"
51 #include "core/loader/FrameLoaderTypes.h" 52 #include "core/loader/FrameLoaderTypes.h"
52 #include "core/loader/NavigationPolicy.h" 53 #include "core/loader/NavigationPolicy.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 #include "public/platform/modules/indexeddb/WebIDBCursor.h" 103 #include "public/platform/modules/indexeddb/WebIDBCursor.h"
103 #include "public/platform/modules/indexeddb/WebIDBDatabase.h" 104 #include "public/platform/modules/indexeddb/WebIDBDatabase.h"
104 #include "public/platform/modules/indexeddb/WebIDBDatabaseException.h" 105 #include "public/platform/modules/indexeddb/WebIDBDatabaseException.h"
105 #include "public/platform/modules/indexeddb/WebIDBFactory.h" 106 #include "public/platform/modules/indexeddb/WebIDBFactory.h"
106 #include "public/platform/modules/indexeddb/WebIDBKey.h" 107 #include "public/platform/modules/indexeddb/WebIDBKey.h"
107 #include "public/platform/modules/indexeddb/WebIDBKeyPath.h" 108 #include "public/platform/modules/indexeddb/WebIDBKeyPath.h"
108 #include "public/platform/modules/indexeddb/WebIDBMetadata.h" 109 #include "public/platform/modules/indexeddb/WebIDBMetadata.h"
109 #include "public/platform/modules/indexeddb/WebIDBTypes.h" 110 #include "public/platform/modules/indexeddb/WebIDBTypes.h"
110 #include "public/web/WebAXEnums.h" 111 #include "public/web/WebAXEnums.h"
111 #include "public/web/WebAXObject.h" 112 #include "public/web/WebAXObject.h"
113 #include "public/web/WebClientRedirectPolicy.h"
112 #include "public/web/WebConsoleMessage.h" 114 #include "public/web/WebConsoleMessage.h"
113 #include "public/web/WebContentSecurityPolicy.h" 115 #include "public/web/WebContentSecurityPolicy.h"
114 #include "public/web/WebFormElement.h" 116 #include "public/web/WebFormElement.h"
115 #include "public/web/WebFrameClient.h" 117 #include "public/web/WebFrameClient.h"
116 #include "public/web/WebFrameLoadType.h" 118 #include "public/web/WebFrameLoadType.h"
117 #include "public/web/WebGeolocationError.h" 119 #include "public/web/WebGeolocationError.h"
118 #include "public/web/WebGeolocationPosition.h" 120 #include "public/web/WebGeolocationPosition.h"
119 #include "public/web/WebHistoryCommitType.h" 121 #include "public/web/WebHistoryCommitType.h"
120 #include "public/web/WebHistoryItem.h" 122 #include "public/web/WebHistoryItem.h"
121 #include "public/web/WebIconURL.h" 123 #include "public/web/WebIconURL.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 STATIC_ASSERT_ENUM(WebApplicationCacheHost::Obsolete, ApplicationCacheHost::OBSO LETE); 377 STATIC_ASSERT_ENUM(WebApplicationCacheHost::Obsolete, ApplicationCacheHost::OBSO LETE);
376 STATIC_ASSERT_ENUM(WebApplicationCacheHost::CheckingEvent, ApplicationCacheHost: :CHECKING_EVENT); 378 STATIC_ASSERT_ENUM(WebApplicationCacheHost::CheckingEvent, ApplicationCacheHost: :CHECKING_EVENT);
377 STATIC_ASSERT_ENUM(WebApplicationCacheHost::ErrorEvent, ApplicationCacheHost::ER ROR_EVENT); 379 STATIC_ASSERT_ENUM(WebApplicationCacheHost::ErrorEvent, ApplicationCacheHost::ER ROR_EVENT);
378 STATIC_ASSERT_ENUM(WebApplicationCacheHost::NoUpdateEvent, ApplicationCacheHost: :NOUPDATE_EVENT); 380 STATIC_ASSERT_ENUM(WebApplicationCacheHost::NoUpdateEvent, ApplicationCacheHost: :NOUPDATE_EVENT);
379 STATIC_ASSERT_ENUM(WebApplicationCacheHost::DownloadingEvent, ApplicationCacheHo st::DOWNLOADING_EVENT); 381 STATIC_ASSERT_ENUM(WebApplicationCacheHost::DownloadingEvent, ApplicationCacheHo st::DOWNLOADING_EVENT);
380 STATIC_ASSERT_ENUM(WebApplicationCacheHost::ProgressEvent, ApplicationCacheHost: :PROGRESS_EVENT); 382 STATIC_ASSERT_ENUM(WebApplicationCacheHost::ProgressEvent, ApplicationCacheHost: :PROGRESS_EVENT);
381 STATIC_ASSERT_ENUM(WebApplicationCacheHost::UpdateReadyEvent, ApplicationCacheHo st::UPDATEREADY_EVENT); 383 STATIC_ASSERT_ENUM(WebApplicationCacheHost::UpdateReadyEvent, ApplicationCacheHo st::UPDATEREADY_EVENT);
382 STATIC_ASSERT_ENUM(WebApplicationCacheHost::CachedEvent, ApplicationCacheHost::C ACHED_EVENT); 384 STATIC_ASSERT_ENUM(WebApplicationCacheHost::CachedEvent, ApplicationCacheHost::C ACHED_EVENT);
383 STATIC_ASSERT_ENUM(WebApplicationCacheHost::ObsoleteEvent, ApplicationCacheHost: :OBSOLETE_EVENT); 385 STATIC_ASSERT_ENUM(WebApplicationCacheHost::ObsoleteEvent, ApplicationCacheHost: :OBSOLETE_EVENT);
384 386
387 STATIC_ASSERT_ENUM(WebClientRedirectPolicy::NotClientRedirect, ClientRedirectPol icy::NotClientRedirect);
388 STATIC_ASSERT_ENUM(WebClientRedirectPolicy::ClientRedirect, ClientRedirectPolicy ::ClientRedirect);
389
385 STATIC_ASSERT_ENUM(WebCursorInfo::TypePointer, Cursor::Pointer); 390 STATIC_ASSERT_ENUM(WebCursorInfo::TypePointer, Cursor::Pointer);
386 STATIC_ASSERT_ENUM(WebCursorInfo::TypeCross, Cursor::Cross); 391 STATIC_ASSERT_ENUM(WebCursorInfo::TypeCross, Cursor::Cross);
387 STATIC_ASSERT_ENUM(WebCursorInfo::TypeHand, Cursor::Hand); 392 STATIC_ASSERT_ENUM(WebCursorInfo::TypeHand, Cursor::Hand);
388 STATIC_ASSERT_ENUM(WebCursorInfo::TypeIBeam, Cursor::IBeam); 393 STATIC_ASSERT_ENUM(WebCursorInfo::TypeIBeam, Cursor::IBeam);
389 STATIC_ASSERT_ENUM(WebCursorInfo::TypeWait, Cursor::Wait); 394 STATIC_ASSERT_ENUM(WebCursorInfo::TypeWait, Cursor::Wait);
390 STATIC_ASSERT_ENUM(WebCursorInfo::TypeHelp, Cursor::Help); 395 STATIC_ASSERT_ENUM(WebCursorInfo::TypeHelp, Cursor::Help);
391 STATIC_ASSERT_ENUM(WebCursorInfo::TypeEastResize, Cursor::EastResize); 396 STATIC_ASSERT_ENUM(WebCursorInfo::TypeEastResize, Cursor::EastResize);
392 STATIC_ASSERT_ENUM(WebCursorInfo::TypeNorthResize, Cursor::NorthResize); 397 STATIC_ASSERT_ENUM(WebCursorInfo::TypeNorthResize, Cursor::NorthResize);
393 STATIC_ASSERT_ENUM(WebCursorInfo::TypeNorthEastResize, Cursor::NorthEastResize); 398 STATIC_ASSERT_ENUM(WebCursorInfo::TypeNorthEastResize, Cursor::NorthEastResize);
394 STATIC_ASSERT_ENUM(WebCursorInfo::TypeNorthWestResize, Cursor::NorthWestResize); 399 STATIC_ASSERT_ENUM(WebCursorInfo::TypeNorthWestResize, Cursor::NorthWestResize);
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, FrameLoadTypeReloadBy passingCache); 738 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, FrameLoadTypeReloadBy passingCache);
734 739
735 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove); 740 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove);
736 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::Swap); 741 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::Swap);
737 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::DetachType::Re move); 742 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::DetachType::Re move);
738 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap ); 743 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap );
739 744
740 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, ""); 745 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, "");
741 746
742 } // namespace blink 747 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp ('k') | third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698