| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "WebNotificationPresenter.h" | 52 #include "WebNotificationPresenter.h" |
| 53 #include "WebPageVisibilityState.h" | 53 #include "WebPageVisibilityState.h" |
| 54 #include "WebSettings.h" | 54 #include "WebSettings.h" |
| 55 #include "WebSpeechRecognizerClient.h" | 55 #include "WebSpeechRecognizerClient.h" |
| 56 #include "WebStorageQuotaError.h" | 56 #include "WebStorageQuotaError.h" |
| 57 #include "WebStorageQuotaType.h" | 57 #include "WebStorageQuotaType.h" |
| 58 #include "WebTextAffinity.h" | 58 #include "WebTextAffinity.h" |
| 59 #include "WebTextCheckingResult.h" | 59 #include "WebTextCheckingResult.h" |
| 60 #include "WebTextCheckingType.h" | 60 #include "WebTextCheckingType.h" |
| 61 #include "WebView.h" | 61 #include "WebView.h" |
| 62 #include "bindings/v8/SerializedScriptValue.h" |
| 62 #include "core/accessibility/AXObjectCache.h" | 63 #include "core/accessibility/AXObjectCache.h" |
| 63 #include "core/accessibility/AccessibilityObject.h" | 64 #include "core/accessibility/AccessibilityObject.h" |
| 64 #include "core/dom/DocumentMarker.h" | 65 #include "core/dom/DocumentMarker.h" |
| 65 #include "core/dom/ExceptionCode.h" | 66 #include "core/dom/ExceptionCode.h" |
| 66 #include "core/dom/IconURL.h" | 67 #include "core/dom/IconURL.h" |
| 67 #include "core/editing/EditorInsertAction.h" | 68 #include "core/editing/EditorInsertAction.h" |
| 68 #include "core/editing/TextAffinity.h" | 69 #include "core/editing/TextAffinity.h" |
| 69 #include "core/fileapi/FileError.h" | 70 #include "core/fileapi/FileError.h" |
| 70 #include "core/html/HTMLFormElement.h" | 71 #include "core/html/HTMLFormElement.h" |
| 71 #include "core/html/HTMLInputElement.h" | 72 #include "core/html/HTMLInputElement.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 #include "public/platform/WebIDBMetadata.h" | 120 #include "public/platform/WebIDBMetadata.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" |
| 130 #include "public/web/WebSerializedScriptValueVersion.h" |
| 129 #include "weborigin/ReferrerPolicy.h" | 131 #include "weborigin/ReferrerPolicy.h" |
| 130 #include "wtf/Assertions.h" | 132 #include "wtf/Assertions.h" |
| 131 #include "wtf/text/StringImpl.h" | 133 #include "wtf/text/StringImpl.h" |
| 132 | 134 |
| 133 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ | 135 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ |
| 134 COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), misma
tching_enums) | 136 COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), misma
tching_enums) |
| 135 | 137 |
| 136 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ | 138 #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ |
| 137 COMPILE_ASSERT(WebKit::webkit_name == WebCore::webcore_name, mismatching_enu
ms) | 139 COMPILE_ASSERT(WebKit::webkit_name == WebCore::webcore_name, mismatching_enu
ms) |
| 138 | 140 |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonReflectionOfCompositedParent, Co
mpositingReasonReflectionOfCompositedParent); | 692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonReflectionOfCompositedParent, Co
mpositingReasonReflectionOfCompositedParent); |
| 691 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); | 693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); |
| 692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); | 694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); |
| 693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); | 695 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); |
| 694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); | 696 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); |
| 695 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); | 697 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); |
| 696 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); | 698 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); |
| 697 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); | 699 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); |
| 698 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); | 700 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); |
| 699 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); | 701 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); |
| 702 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
| OLD | NEW |