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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 #include "modules/geolocation/GeolocationError.h" | 75 #include "modules/geolocation/GeolocationError.h" |
76 #include "modules/geolocation/GeolocationPosition.h" | 76 #include "modules/geolocation/GeolocationPosition.h" |
77 #include "modules/indexeddb/IDBKey.h" | 77 #include "modules/indexeddb/IDBKey.h" |
78 #include "modules/indexeddb/IDBKeyPath.h" | 78 #include "modules/indexeddb/IDBKeyPath.h" |
79 #include "modules/indexeddb/IDBMetadata.h" | 79 #include "modules/indexeddb/IDBMetadata.h" |
80 #include "modules/indexeddb/IndexedDB.h" | 80 #include "modules/indexeddb/IndexedDB.h" |
81 #include "modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.h" | 81 #include "modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.h" |
82 #include "modules/navigatorcontentutils/NavigatorContentUtilsClient.h" | 82 #include "modules/navigatorcontentutils/NavigatorContentUtilsClient.h" |
83 #include "modules/notifications/NotificationClient.h" | 83 #include "modules/notifications/NotificationClient.h" |
84 #include "modules/quota/DeprecatedStorageQuota.h" | 84 #include "modules/quota/DeprecatedStorageQuota.h" |
| 85 #include "modules/screen_orientation/ScreenOrientation.h" |
85 #include "modules/speech/SpeechRecognitionError.h" | 86 #include "modules/speech/SpeechRecognitionError.h" |
86 #include "platform/Cursor.h" | 87 #include "platform/Cursor.h" |
87 #include "platform/FileMetadata.h" | 88 #include "platform/FileMetadata.h" |
88 #include "platform/FileSystemType.h" | 89 #include "platform/FileSystemType.h" |
89 #include "platform/drm/ContentDecryptionModuleSession.h" | 90 #include "platform/drm/ContentDecryptionModuleSession.h" |
90 #include "platform/fonts/FontDescription.h" | 91 #include "platform/fonts/FontDescription.h" |
91 #include "platform/fonts/FontSmoothingMode.h" | 92 #include "platform/fonts/FontSmoothingMode.h" |
92 #include "platform/graphics/filters/FilterOperation.h" | 93 #include "platform/graphics/filters/FilterOperation.h" |
93 #include "platform/graphics/media/MediaPlayer.h" | 94 #include "platform/graphics/media/MediaPlayer.h" |
94 #include "platform/mediastream/MediaStreamSource.h" | 95 #include "platform/mediastream/MediaStreamSource.h" |
(...skipping 19 matching lines...) Expand all Loading... |
114 #include "public/platform/WebMediaPlayerClient.h" | 115 #include "public/platform/WebMediaPlayerClient.h" |
115 #include "public/platform/WebMediaSource.h" | 116 #include "public/platform/WebMediaSource.h" |
116 #include "public/platform/WebMediaStreamSource.h" | 117 #include "public/platform/WebMediaStreamSource.h" |
117 #include "public/platform/WebReferrerPolicy.h" | 118 #include "public/platform/WebReferrerPolicy.h" |
118 #include "public/platform/WebScrollbar.h" | 119 #include "public/platform/WebScrollbar.h" |
119 #include "public/platform/WebStorageQuotaError.h" | 120 #include "public/platform/WebStorageQuotaError.h" |
120 #include "public/platform/WebStorageQuotaType.h" | 121 #include "public/platform/WebStorageQuotaType.h" |
121 #include "public/platform/WebURLRequest.h" | 122 #include "public/platform/WebURLRequest.h" |
122 #include "public/platform/WebURLResponse.h" | 123 #include "public/platform/WebURLResponse.h" |
123 #include "public/web/WebNavigationPolicy.h" | 124 #include "public/web/WebNavigationPolicy.h" |
| 125 #include "public/web/WebScreenOrientation.h" |
124 #include "public/web/WebSerializedScriptValueVersion.h" | 126 #include "public/web/WebSerializedScriptValueVersion.h" |
125 #include "public/web/WebTouchAction.h" | 127 #include "public/web/WebTouchAction.h" |
126 #include "wtf/Assertions.h" | 128 #include "wtf/Assertions.h" |
127 #include "wtf/text/StringImpl.h" | 129 #include "wtf/text/StringImpl.h" |
128 | 130 |
129 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ | 131 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ |
130 COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismat
ching_enums) | 132 COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismat
ching_enums) |
131 | 133 |
132 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ | 134 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ |
133 COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enum
s) | 135 COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enum
s) |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorInvalidState, FileError::INVALID_STATE_
ERR); | 517 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorInvalidState, FileError::INVALID_STATE_
ERR); |
516 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorSyntax, FileError::SYNTAX_ERR); | 518 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorSyntax, FileError::SYNTAX_ERR); |
517 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorInvalidModification, FileError::INVALID
_MODIFICATION_ERR); | 519 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorInvalidModification, FileError::INVALID
_MODIFICATION_ERR); |
518 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorQuotaExceeded, FileError::QUOTA_EXCEEDE
D_ERR); | 520 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorQuotaExceeded, FileError::QUOTA_EXCEEDE
D_ERR); |
519 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorTypeMismatch, FileError::TYPE_MISMATCH_
ERR); | 521 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorTypeMismatch, FileError::TYPE_MISMATCH_
ERR); |
520 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorPathExists, FileError::PATH_EXISTS_ERR)
; | 522 COMPILE_ASSERT_MATCHING_ENUM(WebFileErrorPathExists, FileError::PATH_EXISTS_ERR)
; |
521 | 523 |
522 COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPermissionDenied, Geoloca
tionError::PermissionDenied); | 524 COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPermissionDenied, Geoloca
tionError::PermissionDenied); |
523 COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPositionUnavailable, Geol
ocationError::PositionUnavailable); | 525 COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPositionUnavailable, Geol
ocationError::PositionUnavailable); |
524 | 526 |
| 527 COMPILE_ASSERT_MATCHING_ENUM(WebScreenOrientationPortraitPrimary, OrientationPor
traitPrimary); |
| 528 COMPILE_ASSERT_MATCHING_ENUM(WebScreenOrientationLandscapePrimary, OrientationLa
ndscapePrimary); |
| 529 COMPILE_ASSERT_MATCHING_ENUM(WebScreenOrientationPortraitSecondary, OrientationP
ortraitSecondary); |
| 530 COMPILE_ASSERT_MATCHING_ENUM(WebScreenOrientationLandscapeSecondary, Orientation
LandscapeSecondary); |
| 531 |
525 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeSpelling, TextCheckingTypeSpelli
ng); | 532 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeSpelling, TextCheckingTypeSpelli
ng); |
526 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeGrammar, TextCheckingTypeGrammar
); | 533 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeGrammar, TextCheckingTypeGrammar
); |
527 | 534 |
528 // TODO(rouslan): Remove these comparisons between text-checking and text-decora
tion enum values after removing the | 535 // TODO(rouslan): Remove these comparisons between text-checking and text-decora
tion enum values after removing the |
529 // deprecated constructor WebTextCheckingResult(WebTextCheckingType). | 536 // deprecated constructor WebTextCheckingResult(WebTextCheckingType). |
530 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeSpelling, TextDecorationTypeSpel
ling); | 537 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeSpelling, TextDecorationTypeSpel
ling); |
531 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeGrammar, TextDecorationTypeGramm
ar); | 538 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeGrammar, TextDecorationTypeGramm
ar); |
532 | 539 |
533 COMPILE_ASSERT_MATCHING_ENUM(WebTextDecorationTypeSpelling, TextDecorationTypeSp
elling); | 540 COMPILE_ASSERT_MATCHING_ENUM(WebTextDecorationTypeSpelling, TextDecorationTypeSp
elling); |
534 COMPILE_ASSERT_MATCHING_ENUM(WebTextDecorationTypeGrammar, TextDecorationTypeGra
mmar); | 541 COMPILE_ASSERT_MATCHING_ENUM(WebTextDecorationTypeGrammar, TextDecorationTypeGra
mmar); |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersNew, NavigatorContentUtilsClient::
CustomHandlersNew); | 615 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersNew, NavigatorContentUtilsClient::
CustomHandlersNew); |
609 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsC
lient::CustomHandlersRegistered); | 616 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsC
lient::CustomHandlersRegistered); |
610 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsCli
ent::CustomHandlersDeclined); | 617 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsCli
ent::CustomHandlersDeclined); |
611 | 618 |
612 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone); | 619 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone); |
613 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto); | 620 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto); |
614 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX); | 621 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX); |
615 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY); | 622 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY); |
616 | 623 |
617 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 624 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
OLD | NEW |