| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 #include "public/web/WebTextAffinity.h" | 126 #include "public/web/WebTextAffinity.h" |
| 127 #include "public/web/WebTextCheckingResult.h" | 127 #include "public/web/WebTextCheckingResult.h" |
| 128 #include "public/web/WebTextCheckingType.h" | 128 #include "public/web/WebTextCheckingType.h" |
| 129 #include "public/web/WebTextDecorationType.h" | 129 #include "public/web/WebTextDecorationType.h" |
| 130 #include "public/web/WebTouchAction.h" | 130 #include "public/web/WebTouchAction.h" |
| 131 #include "public/web/WebView.h" | 131 #include "public/web/WebView.h" |
| 132 #include "wtf/Assertions.h" | 132 #include "wtf/Assertions.h" |
| 133 #include "wtf/text/StringImpl.h" | 133 #include "wtf/text/StringImpl.h" |
| 134 | 134 |
| 135 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ | 135 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ |
| 136 COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismat
ching_enums) | 136 COMPILE_ASSERT(int(blink::webkit_name) == int(blink::webcore_name), mismatch
ing_enums) |
| 137 | 137 |
| 138 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ | 138 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ |
| 139 COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enum
s) | 139 COMPILE_ASSERT(blink::webkit_name == blink::webcore_name, mismatching_enums) |
| 140 | 140 |
| 141 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventActiveDescendantChanged, AXObjectCache::A
XActiveDescendantChanged); | 141 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventActiveDescendantChanged, AXObjectCache::A
XActiveDescendantChanged); |
| 142 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventAlert, AXObjectCache::AXAlert); | 142 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventAlert, AXObjectCache::AXAlert); |
| 143 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventAriaAttributeChanged, AXObjectCache::AXAr
iaAttributeChanged); | 143 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventAriaAttributeChanged, AXObjectCache::AXAr
iaAttributeChanged); |
| 144 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventAutocorrectionOccured, AXObjectCache::AXA
utocorrectionOccured); | 144 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventAutocorrectionOccured, AXObjectCache::AXA
utocorrectionOccured); |
| 145 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventBlur, AXObjectCache::AXBlur); | 145 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventBlur, AXObjectCache::AXBlur); |
| 146 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventCheckedStateChanged, AXObjectCache::AXChe
ckedStateChanged); | 146 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventCheckedStateChanged, AXObjectCache::AXChe
ckedStateChanged); |
| 147 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventChildrenChanged, AXObjectCache::AXChildre
nChanged); | 147 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventChildrenChanged, AXObjectCache::AXChildre
nChanged); |
| 148 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventFocus, AXObjectCache::AXFocusedUIElementC
hanged); | 148 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventFocus, AXObjectCache::AXFocusedUIElementC
hanged); |
| 149 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventHide, AXObjectCache::AXHide); | 149 COMPILE_ASSERT_MATCHING_ENUM(WebAXEventHide, AXObjectCache::AXHide); |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 605 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsC
lient::CustomHandlersRegistered); | 605 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsC
lient::CustomHandlersRegistered); |
| 606 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsCli
ent::CustomHandlersDeclined); | 606 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsCli
ent::CustomHandlersDeclined); |
| 607 | 607 |
| 608 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone); | 608 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone); |
| 609 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto); | 609 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto); |
| 610 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX); | 610 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX); |
| 611 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY); | 611 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY); |
| 612 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom); | 612 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom); |
| 613 | 613 |
| 614 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 614 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
| OLD | NEW |