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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 #include "core/loader/NavigationPolicy.h" | 68 #include "core/loader/NavigationPolicy.h" |
69 #include "core/loader/appcache/ApplicationCacheHost.h" | 69 #include "core/loader/appcache/ApplicationCacheHost.h" |
70 #include "core/page/InjectedStyleSheet.h" | 70 #include "core/page/InjectedStyleSheet.h" |
71 #include "core/page/PageVisibilityState.h" | 71 #include "core/page/PageVisibilityState.h" |
72 #include "core/page/Settings.h" | 72 #include "core/page/Settings.h" |
73 #include "core/platform/Cursor.h" | 73 #include "core/platform/Cursor.h" |
74 #include "core/platform/graphics/filters/FilterOperation.h" | 74 #include "core/platform/graphics/filters/FilterOperation.h" |
75 #include "core/platform/mediastream/RTCDataChannelHandlerClient.h" | 75 #include "core/platform/mediastream/RTCDataChannelHandlerClient.h" |
76 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h" | 76 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h" |
77 #include "core/rendering/CompositingReasons.h" | 77 #include "core/rendering/CompositingReasons.h" |
| 78 #include "core/rendering/style/RenderStyleConstants.h" |
78 #include "modules/geolocation/GeolocationError.h" | 79 #include "modules/geolocation/GeolocationError.h" |
79 #include "modules/geolocation/GeolocationPosition.h" | 80 #include "modules/geolocation/GeolocationPosition.h" |
80 #include "modules/indexeddb/IDBKey.h" | 81 #include "modules/indexeddb/IDBKey.h" |
81 #include "modules/indexeddb/IDBKeyPath.h" | 82 #include "modules/indexeddb/IDBKeyPath.h" |
82 #include "modules/indexeddb/IDBMetadata.h" | 83 #include "modules/indexeddb/IDBMetadata.h" |
83 #include "modules/indexeddb/IndexedDB.h" | 84 #include "modules/indexeddb/IndexedDB.h" |
84 #include "modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.h" | 85 #include "modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.h" |
85 #include "modules/notifications/NotificationClient.h" | 86 #include "modules/notifications/NotificationClient.h" |
86 #include "modules/quota/StorageQuota.h" | 87 #include "modules/quota/StorageQuota.h" |
87 #include "modules/speech/SpeechRecognitionError.h" | 88 #include "modules/speech/SpeechRecognitionError.h" |
(...skipping 30 matching lines...) Expand all Loading... |
118 #include "public/platform/WebRTCDataChannelHandlerClient.h" | 119 #include "public/platform/WebRTCDataChannelHandlerClient.h" |
119 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" | 120 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" |
120 #include "public/platform/WebReferrerPolicy.h" | 121 #include "public/platform/WebReferrerPolicy.h" |
121 #include "public/platform/WebScrollbar.h" | 122 #include "public/platform/WebScrollbar.h" |
122 #include "public/platform/WebStorageQuotaError.h" | 123 #include "public/platform/WebStorageQuotaError.h" |
123 #include "public/platform/WebStorageQuotaType.h" | 124 #include "public/platform/WebStorageQuotaType.h" |
124 #include "public/platform/WebURLRequest.h" | 125 #include "public/platform/WebURLRequest.h" |
125 #include "public/platform/WebURLResponse.h" | 126 #include "public/platform/WebURLResponse.h" |
126 #include "public/web/WebNavigationPolicy.h" | 127 #include "public/web/WebNavigationPolicy.h" |
127 #include "public/web/WebSerializedScriptValueVersion.h" | 128 #include "public/web/WebSerializedScriptValueVersion.h" |
| 129 #include "public/web/WebTouchAction.h" |
128 #include "wtf/Assertions.h" | 130 #include "wtf/Assertions.h" |
129 #include "wtf/text/StringImpl.h" | 131 #include "wtf/text/StringImpl.h" |
130 | 132 |
131 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ | 133 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ |
132 COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismat
ching_enums) | 134 COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismat
ching_enums) |
133 | 135 |
134 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ | 136 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ |
135 COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enum
s) | 137 COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enum
s) |
136 | 138 |
137 // These constants are in WTF, bring them into WebCore so the ASSERT still works
for them! | 139 // These constants are in WTF, bring them into WebCore so the ASSERT still works
for them! |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
639 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewForegroundTab, NavigationPoli
cyNewForegroundTab); | 641 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewForegroundTab, NavigationPoli
cyNewForegroundTab); |
640 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewWindow, NavigationPolicyNewWi
ndow); | 642 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewWindow, NavigationPolicyNewWi
ndow); |
641 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewPopup, NavigationPolicyNewPop
up); | 643 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewPopup, NavigationPolicyNewPop
up); |
642 | 644 |
643 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel); | 645 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel); |
644 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); | 646 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); |
645 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve
l); | 647 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve
l); |
646 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); | 648 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); |
647 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel); | 649 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel); |
648 | 650 |
| 651 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone); |
| 652 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto); |
| 653 |
649 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonUnknown, CompositingReasonNone); | 654 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonUnknown, CompositingReasonNone); |
650 COMPILE_ASSERT_MATCHING_UINT64(CompositingReason3DTransform, CompositingReason3D
Transform); | 655 COMPILE_ASSERT_MATCHING_UINT64(CompositingReason3DTransform, CompositingReason3D
Transform); |
651 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonVideo, CompositingReasonVideo); | 656 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonVideo, CompositingReasonVideo); |
652 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonCanvas, CompositingReasonCanvas)
; | 657 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonCanvas, CompositingReasonCanvas)
; |
653 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPlugin, CompositingReasonPlugin)
; | 658 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPlugin, CompositingReasonPlugin)
; |
654 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIFrame, CompositingReasonIFrame)
; | 659 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIFrame, CompositingReasonIFrame)
; |
655 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonBackfaceVisibilityHidden, Compos
itingReasonBackfaceVisibilityHidden); | 660 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonBackfaceVisibilityHidden, Compos
itingReasonBackfaceVisibilityHidden); |
656 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonAnimation, CompositingReasonAnim
ation); | 661 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonAnimation, CompositingReasonAnim
ation); |
657 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonFilters, CompositingReasonFilter
s); | 662 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonFilters, CompositingReasonFilter
s); |
658 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPositionFixed, CompositingReason
PositionFixed); | 663 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPositionFixed, CompositingReason
PositionFixed); |
(...skipping 16 matching lines...) Expand all Loading... |
675 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); | 680 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); |
676 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); | 681 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); |
677 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); | 682 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); |
678 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); | 683 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); |
679 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); | 684 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); |
680 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); | 685 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); |
681 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); | 686 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); |
682 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); | 687 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); |
683 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIsolateCompositedDescendants, Co
mpositingReasonIsolateCompositedDescendants); | 688 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIsolateCompositedDescendants, Co
mpositingReasonIsolateCompositedDescendants); |
684 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 689 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
OLD | NEW |