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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 #include "platform/FileSystemType.h" | 97 #include "platform/FileSystemType.h" |
98 #include "platform/drm/ContentDecryptionModuleSession.h" | 98 #include "platform/drm/ContentDecryptionModuleSession.h" |
99 #include "platform/fonts/FontDescription.h" | 99 #include "platform/fonts/FontDescription.h" |
100 #include "platform/fonts/FontSmoothingMode.h" | 100 #include "platform/fonts/FontSmoothingMode.h" |
101 #include "platform/graphics/media/MediaPlayer.h" | 101 #include "platform/graphics/media/MediaPlayer.h" |
102 #include "platform/mediastream/MediaStreamSource.h" | 102 #include "platform/mediastream/MediaStreamSource.h" |
103 #include "platform/network/ResourceLoadPriority.h" | 103 #include "platform/network/ResourceLoadPriority.h" |
104 #include "platform/network/ResourceResponse.h" | 104 #include "platform/network/ResourceResponse.h" |
105 #include "platform/text/TextChecking.h" | 105 #include "platform/text/TextChecking.h" |
106 #include "platform/text/TextDecoration.h" | 106 #include "platform/text/TextDecoration.h" |
| 107 #include "platform/weborigin/ReferrerPolicy.h" |
107 #include "public/platform/WebClipboard.h" | 108 #include "public/platform/WebClipboard.h" |
108 #include "public/platform/WebCompositingReasons.h" | 109 #include "public/platform/WebCompositingReasons.h" |
109 #include "public/platform/WebFileError.h" | 110 #include "public/platform/WebFileError.h" |
110 #include "public/platform/WebFileInfo.h" | 111 #include "public/platform/WebFileInfo.h" |
111 #include "public/platform/WebFileSystem.h" | 112 #include "public/platform/WebFileSystem.h" |
112 #include "public/platform/WebIDBCursor.h" | 113 #include "public/platform/WebIDBCursor.h" |
113 #include "public/platform/WebIDBDatabase.h" | 114 #include "public/platform/WebIDBDatabase.h" |
114 #include "public/platform/WebIDBDatabaseException.h" | 115 #include "public/platform/WebIDBDatabaseException.h" |
115 #include "public/platform/WebIDBFactory.h" | 116 #include "public/platform/WebIDBFactory.h" |
116 #include "public/platform/WebIDBKey.h" | 117 #include "public/platform/WebIDBKey.h" |
117 #include "public/platform/WebIDBKeyPath.h" | 118 #include "public/platform/WebIDBKeyPath.h" |
118 #include "public/platform/WebIDBMetadata.h" | 119 #include "public/platform/WebIDBMetadata.h" |
119 #include "public/platform/WebIDBTypes.h" | 120 #include "public/platform/WebIDBTypes.h" |
120 #include "public/platform/WebMediaSource.h" | 121 #include "public/platform/WebMediaSource.h" |
121 #include "public/platform/WebMediaStreamSource.h" | 122 #include "public/platform/WebMediaStreamSource.h" |
122 #include "public/platform/WebRTCDataChannelHandlerClient.h" | 123 #include "public/platform/WebRTCDataChannelHandlerClient.h" |
123 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" | 124 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" |
124 #include "public/platform/WebReferrerPolicy.h" | 125 #include "public/platform/WebReferrerPolicy.h" |
125 #include "public/platform/WebScrollbar.h" | 126 #include "public/platform/WebScrollbar.h" |
126 #include "public/platform/WebURLRequest.h" | 127 #include "public/platform/WebURLRequest.h" |
127 #include "public/platform/WebURLResponse.h" | 128 #include "public/platform/WebURLResponse.h" |
128 #include "public/web/WebNavigationPolicy.h" | 129 #include "public/web/WebNavigationPolicy.h" |
129 #include "public/web/WebSerializedScriptValueVersion.h" | 130 #include "public/web/WebSerializedScriptValueVersion.h" |
130 #include "weborigin/ReferrerPolicy.h" | |
131 #include "wtf/Assertions.h" | 131 #include "wtf/Assertions.h" |
132 #include "wtf/text/StringImpl.h" | 132 #include "wtf/text/StringImpl.h" |
133 | 133 |
134 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ | 134 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ |
135 COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismat
ching_enums) | 135 COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismat
ching_enums) |
136 | 136 |
137 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ | 137 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ |
138 COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enum
s) | 138 COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enum
s) |
139 | 139 |
140 // These constants are in WTF, bring them into WebCore so the ASSERT still works
for them! | 140 // These constants are in WTF, bring them into WebCore so the ASSERT still works
for them! |
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
686 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); | 686 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); |
687 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); | 687 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); |
688 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); | 688 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); |
689 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); | 689 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); |
690 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); | 690 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); |
691 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); | 691 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); |
692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); | 692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); |
693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); | 693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); |
694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); | 694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); |
695 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 695 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
OLD | NEW |