Chromium Code Reviews| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 #include "public/web/WebNavigationPolicy.h" | 119 #include "public/web/WebNavigationPolicy.h" |
| 120 #include "public/web/WebNavigatorContentUtilsClient.h" | 120 #include "public/web/WebNavigatorContentUtilsClient.h" |
| 121 #include "public/web/WebRemoteFrameClient.h" | 121 #include "public/web/WebRemoteFrameClient.h" |
| 122 #include "public/web/WebSandboxFlags.h" | 122 #include "public/web/WebSandboxFlags.h" |
| 123 #include "public/web/WebSecurityPolicy.h" | 123 #include "public/web/WebSecurityPolicy.h" |
| 124 #include "public/web/WebSelection.h" | 124 #include "public/web/WebSelection.h" |
| 125 #include "public/web/WebSerializedScriptValueVersion.h" | 125 #include "public/web/WebSerializedScriptValueVersion.h" |
| 126 #include "public/web/WebSettings.h" | 126 #include "public/web/WebSettings.h" |
| 127 #include "public/web/WebSpeechRecognizerClient.h" | 127 #include "public/web/WebSpeechRecognizerClient.h" |
| 128 #include "public/web/WebTextCheckingResult.h" | 128 #include "public/web/WebTextCheckingResult.h" |
| 129 #include "public/web/WebTextCheckingType.h" | |
| 130 #include "public/web/WebTextDecorationType.h" | 129 #include "public/web/WebTextDecorationType.h" |
| 131 #include "public/web/WebTouchAction.h" | 130 #include "public/web/WebTouchAction.h" |
| 132 #include "public/web/WebView.h" | 131 #include "public/web/WebView.h" |
| 133 #include "wtf/Assertions.h" | 132 #include "wtf/Assertions.h" |
| 134 #include "wtf/text/StringImpl.h" | 133 #include "wtf/text/StringImpl.h" |
| 135 | 134 |
| 136 namespace blink { | 135 namespace blink { |
| 137 | 136 |
| 138 #define STATIC_ASSERT_ENUM(a, b) \ | 137 #define STATIC_ASSERT_ENUM(a, b) \ |
| 139 static_assert(static_cast<int>(a) == static_cast<int>(b), \ | 138 static_assert(static_cast<int>(a) == static_cast<int>(b), \ |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 581 STATIC_ASSERT_ENUM(WebFileErrorNotReadable, FileError::kNotReadableErr); | 580 STATIC_ASSERT_ENUM(WebFileErrorNotReadable, FileError::kNotReadableErr); |
| 582 STATIC_ASSERT_ENUM(WebFileErrorEncoding, FileError::kEncodingErr); | 581 STATIC_ASSERT_ENUM(WebFileErrorEncoding, FileError::kEncodingErr); |
| 583 STATIC_ASSERT_ENUM(WebFileErrorNoModificationAllowed, FileError::kNoModification AllowedErr); | 582 STATIC_ASSERT_ENUM(WebFileErrorNoModificationAllowed, FileError::kNoModification AllowedErr); |
| 584 STATIC_ASSERT_ENUM(WebFileErrorInvalidState, FileError::kInvalidStateErr); | 583 STATIC_ASSERT_ENUM(WebFileErrorInvalidState, FileError::kInvalidStateErr); |
| 585 STATIC_ASSERT_ENUM(WebFileErrorSyntax, FileError::kSyntaxErr); | 584 STATIC_ASSERT_ENUM(WebFileErrorSyntax, FileError::kSyntaxErr); |
| 586 STATIC_ASSERT_ENUM(WebFileErrorInvalidModification, FileError::kInvalidModificat ionErr); | 585 STATIC_ASSERT_ENUM(WebFileErrorInvalidModification, FileError::kInvalidModificat ionErr); |
| 587 STATIC_ASSERT_ENUM(WebFileErrorQuotaExceeded, FileError::kQuotaExceededErr); | 586 STATIC_ASSERT_ENUM(WebFileErrorQuotaExceeded, FileError::kQuotaExceededErr); |
| 588 STATIC_ASSERT_ENUM(WebFileErrorTypeMismatch, FileError::kTypeMismatchErr); | 587 STATIC_ASSERT_ENUM(WebFileErrorTypeMismatch, FileError::kTypeMismatchErr); |
| 589 STATIC_ASSERT_ENUM(WebFileErrorPathExists, FileError::kPathExistsErr); | 588 STATIC_ASSERT_ENUM(WebFileErrorPathExists, FileError::kPathExistsErr); |
| 590 | 589 |
| 591 STATIC_ASSERT_ENUM(WebTextCheckingTypeSpelling, TextCheckingTypeSpelling); | |
| 592 STATIC_ASSERT_ENUM(WebTextCheckingTypeGrammar, TextCheckingTypeGrammar); | |
| 593 | |
| 594 // TODO(rouslan): Remove these comparisons between text-checking and text-decora tion enum values after removing the | |
|
Xiaocheng
2016/08/10 04:57:49
To rouslan: I haven't found the deprecated constru
please use gerrit instead
2016/08/10 05:16:58
Yes.
| |
| 595 // deprecated constructor WebTextCheckingResult(WebTextCheckingType). | |
| 596 STATIC_ASSERT_ENUM(WebTextCheckingTypeSpelling, TextDecorationTypeSpelling); | |
| 597 STATIC_ASSERT_ENUM(WebTextCheckingTypeGrammar, TextDecorationTypeGrammar); | |
| 598 | |
| 599 STATIC_ASSERT_ENUM(WebTextDecorationTypeSpelling, TextDecorationTypeSpelling); | 590 STATIC_ASSERT_ENUM(WebTextDecorationTypeSpelling, TextDecorationTypeSpelling); |
| 600 STATIC_ASSERT_ENUM(WebTextDecorationTypeGrammar, TextDecorationTypeGrammar); | 591 STATIC_ASSERT_ENUM(WebTextDecorationTypeGrammar, TextDecorationTypeGrammar); |
| 601 STATIC_ASSERT_ENUM(WebTextDecorationTypeInvisibleSpellcheck, TextDecorationTypeI nvisibleSpellcheck); | 592 STATIC_ASSERT_ENUM(WebTextDecorationTypeInvisibleSpellcheck, TextDecorationTypeI nvisibleSpellcheck); |
| 602 | 593 |
| 603 STATIC_ASSERT_ENUM(WebStorageQuotaErrorNotSupported, NotSupportedError); | 594 STATIC_ASSERT_ENUM(WebStorageQuotaErrorNotSupported, NotSupportedError); |
| 604 STATIC_ASSERT_ENUM(WebStorageQuotaErrorInvalidModification, InvalidModificationE rror); | 595 STATIC_ASSERT_ENUM(WebStorageQuotaErrorInvalidModification, InvalidModificationE rror); |
| 605 STATIC_ASSERT_ENUM(WebStorageQuotaErrorInvalidAccess, InvalidAccessError); | 596 STATIC_ASSERT_ENUM(WebStorageQuotaErrorInvalidAccess, InvalidAccessError); |
| 606 STATIC_ASSERT_ENUM(WebStorageQuotaErrorAbort, AbortError); | 597 STATIC_ASSERT_ENUM(WebStorageQuotaErrorAbort, AbortError); |
| 607 | 598 |
| 608 STATIC_ASSERT_ENUM(WebStorageQuotaTypeTemporary, DeprecatedStorageQuota::Tempora ry); | 599 STATIC_ASSERT_ENUM(WebStorageQuotaTypeTemporary, DeprecatedStorageQuota::Tempora ry); |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 757 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap ); | 748 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap ); |
| 758 | 749 |
| 759 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, ProgressBarCom pletion::LoadEvent); | 750 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, ProgressBarCom pletion::LoadEvent); |
| 760 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, Progr essBarCompletion::ResourcesBeforeDCL); | 751 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, Progr essBarCompletion::ResourcesBeforeDCL); |
| 761 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, Progres sBarCompletion::DOMContentLoaded); | 752 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, Progres sBarCompletion::DOMContentLoaded); |
| 762 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSame OriginIFrames, ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); | 753 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSame OriginIFrames, ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); |
| 763 | 754 |
| 764 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, ""); | 755 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, ""); |
| 765 | 756 |
| 766 } // namespace blink | 757 } // namespace blink |
| OLD | NEW |