| 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 26 matching lines...) Expand all Loading... |
| 37 #include "WebAXObject.h" | 37 #include "WebAXObject.h" |
| 38 #include "WebApplicationCacheHost.h" | 38 #include "WebApplicationCacheHost.h" |
| 39 #include "WebConsoleMessage.h" | 39 #include "WebConsoleMessage.h" |
| 40 #include "WebContentSecurityPolicy.h" | 40 #include "WebContentSecurityPolicy.h" |
| 41 #include "WebCursorInfo.h" | 41 #include "WebCursorInfo.h" |
| 42 #include "WebFontDescription.h" | 42 #include "WebFontDescription.h" |
| 43 #include "WebFormElement.h" | 43 #include "WebFormElement.h" |
| 44 #include "WebGeolocationError.h" | 44 #include "WebGeolocationError.h" |
| 45 #include "WebGeolocationPosition.h" | 45 #include "WebGeolocationPosition.h" |
| 46 #include "WebIconURL.h" | 46 #include "WebIconURL.h" |
| 47 #include "WebInbandTextTrack.h" | |
| 48 #include "WebInputElement.h" | 47 #include "WebInputElement.h" |
| 49 #include "WebMediaPlayer.h" | 48 #include "WebMediaPlayer.h" |
| 50 #include "WebMediaPlayerClient.h" | 49 #include "WebMediaPlayerClient.h" |
| 51 #include "WebNotificationPresenter.h" | 50 #include "WebNotificationPresenter.h" |
| 52 #include "WebPageVisibilityState.h" | 51 #include "WebPageVisibilityState.h" |
| 53 #include "WebSettings.h" | 52 #include "WebSettings.h" |
| 54 #include "WebSpeechRecognizerClient.h" | 53 #include "WebSpeechRecognizerClient.h" |
| 55 #include "WebStorageQuotaError.h" | 54 #include "WebStorageQuotaError.h" |
| 56 #include "WebStorageQuotaType.h" | 55 #include "WebStorageQuotaType.h" |
| 57 #include "WebTextAffinity.h" | 56 #include "WebTextAffinity.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 #include "modules/indexeddb/IDBMetadata.h" | 91 #include "modules/indexeddb/IDBMetadata.h" |
| 93 #include "modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.h" | 92 #include "modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.h" |
| 94 #include "modules/notifications/NotificationClient.h" | 93 #include "modules/notifications/NotificationClient.h" |
| 95 #include "modules/quota/StorageQuota.h" | 94 #include "modules/quota/StorageQuota.h" |
| 96 #include "modules/speech/SpeechRecognitionError.h" | 95 #include "modules/speech/SpeechRecognitionError.h" |
| 97 #include "platform/FileMetadata.h" | 96 #include "platform/FileMetadata.h" |
| 98 #include "platform/FileSystemType.h" | 97 #include "platform/FileSystemType.h" |
| 99 #include "platform/drm/ContentDecryptionModuleSession.h" | 98 #include "platform/drm/ContentDecryptionModuleSession.h" |
| 100 #include "platform/fonts/FontDescription.h" | 99 #include "platform/fonts/FontDescription.h" |
| 101 #include "platform/fonts/FontSmoothingMode.h" | 100 #include "platform/fonts/FontSmoothingMode.h" |
| 102 #include "platform/graphics/media/InbandTextTrackPrivate.h" | |
| 103 #include "platform/graphics/media/MediaPlayer.h" | 101 #include "platform/graphics/media/MediaPlayer.h" |
| 104 #include "platform/network/ResourceLoadPriority.h" | 102 #include "platform/network/ResourceLoadPriority.h" |
| 105 #include "platform/network/ResourceResponse.h" | 103 #include "platform/network/ResourceResponse.h" |
| 106 #include "platform/text/TextChecking.h" | 104 #include "platform/text/TextChecking.h" |
| 107 #include "platform/text/TextDecoration.h" | 105 #include "platform/text/TextDecoration.h" |
| 108 #include "public/platform/WebClipboard.h" | 106 #include "public/platform/WebClipboard.h" |
| 109 #include "public/platform/WebCompositingReasons.h" | 107 #include "public/platform/WebCompositingReasons.h" |
| 110 #include "public/platform/WebFileError.h" | 108 #include "public/platform/WebFileError.h" |
| 111 #include "public/platform/WebFileInfo.h" | 109 #include "public/platform/WebFileInfo.h" |
| 112 #include "public/platform/WebFileSystem.h" | 110 #include "public/platform/WebFileSystem.h" |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::Weight800, FontWeight800); | 391 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::Weight800, FontWeight800); |
| 394 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::Weight900, FontWeight900); | 392 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::Weight900, FontWeight900); |
| 395 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightNormal, FontWeightNormal)
; | 393 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightNormal, FontWeightNormal)
; |
| 396 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold); | 394 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold); |
| 397 | 395 |
| 398 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeInvalid, InvalidIcon); | 396 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeInvalid, InvalidIcon); |
| 399 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeFavicon, Favicon); | 397 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeFavicon, Favicon); |
| 400 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouch, TouchIcon); | 398 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouch, TouchIcon); |
| 401 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouchPrecomposed, TouchPrecomposedI
con); | 399 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouchPrecomposed, TouchPrecomposedI
con); |
| 402 | 400 |
| 403 COMPILE_ASSERT_MATCHING_ENUM(WebInbandTextTrack::KindSubtitles, InbandTextTrackP
rivate::Subtitles); | |
| 404 COMPILE_ASSERT_MATCHING_ENUM(WebInbandTextTrack::KindCaptions, InbandTextTrackPr
ivate::Captions); | |
| 405 COMPILE_ASSERT_MATCHING_ENUM(WebInbandTextTrack::KindDescriptions, InbandTextTra
ckPrivate::Descriptions); | |
| 406 COMPILE_ASSERT_MATCHING_ENUM(WebInbandTextTrack::KindChapters, InbandTextTrackPr
ivate::Chapters); | |
| 407 COMPILE_ASSERT_MATCHING_ENUM(WebInbandTextTrack::KindMetadata, InbandTextTrackPr
ivate::Metadata); | |
| 408 COMPILE_ASSERT_MATCHING_ENUM(WebInbandTextTrack::KindNone, InbandTextTrackPrivat
e::None); | |
| 409 | |
| 410 #if ENABLE(INPUT_SPEECH) | 401 #if ENABLE(INPUT_SPEECH) |
| 411 COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Idle, InputFieldSpeechButtonElemen
t::Idle); | 402 COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Idle, InputFieldSpeechButtonElemen
t::Idle); |
| 412 COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Recording, InputFieldSpeechButtonE
lement::Recording); | 403 COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Recording, InputFieldSpeechButtonE
lement::Recording); |
| 413 COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Recognizing, InputFieldSpeechButto
nElement::Recognizing); | 404 COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Recognizing, InputFieldSpeechButto
nElement::Recognizing); |
| 414 #endif | 405 #endif |
| 415 | 406 |
| 416 COMPILE_ASSERT_MATCHING_ENUM(WebNode::ElementNode, Node::ELEMENT_NODE); | 407 COMPILE_ASSERT_MATCHING_ENUM(WebNode::ElementNode, Node::ELEMENT_NODE); |
| 417 COMPILE_ASSERT_MATCHING_ENUM(WebNode::AttributeNode, Node::ATTRIBUTE_NODE); | 408 COMPILE_ASSERT_MATCHING_ENUM(WebNode::AttributeNode, Node::ATTRIBUTE_NODE); |
| 418 COMPILE_ASSERT_MATCHING_ENUM(WebNode::TextNode, Node::TEXT_NODE); | 409 COMPILE_ASSERT_MATCHING_ENUM(WebNode::TextNode, Node::TEXT_NODE); |
| 419 COMPILE_ASSERT_MATCHING_ENUM(WebNode::CDataSectionNode, Node::CDATA_SECTION_NODE
); | 410 COMPILE_ASSERT_MATCHING_ENUM(WebNode::CDataSectionNode, Node::CDATA_SECTION_NODE
); |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); | 685 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); |
| 695 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); | 686 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); |
| 696 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); | 687 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); |
| 697 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); | 688 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); |
| 698 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); | 689 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); |
| 699 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); | 690 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); |
| 700 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); | 691 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); |
| 701 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); | 692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); |
| 702 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); | 693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); |
| 703 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 694 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
| OLD | NEW |