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 "public/platform/WebBlendMode.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" |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
651 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewForegroundTab, NavigationPoli
cyNewForegroundTab); | 652 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewForegroundTab, NavigationPoli
cyNewForegroundTab); |
652 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewWindow, NavigationPolicyNewWi
ndow); | 653 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewWindow, NavigationPolicyNewWi
ndow); |
653 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewPopup, NavigationPolicyNewPop
up); | 654 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewPopup, NavigationPolicyNewPop
up); |
654 | 655 |
655 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel); | 656 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel); |
656 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); | 657 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); |
657 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve
l); | 658 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve
l); |
658 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); | 659 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); |
659 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel); | 660 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel); |
660 | 661 |
| 662 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeNormal, BlendModeNormal); |
| 663 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeMultiply, BlendModeMultiply); |
| 664 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeScreen, BlendModeScreen); |
| 665 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeOverlay, BlendModeOverlay); |
| 666 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeDarken, BlendModeDarken); |
| 667 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeLighten, BlendModeLighten); |
| 668 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeColorDodge, BlendModeColorDodge); |
| 669 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeColorBurn, BlendModeColorBurn); |
| 670 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeHardLight, BlendModeHardLight); |
| 671 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeSoftLight, BlendModeSoftLight); |
| 672 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeDifference, BlendModeDifference); |
| 673 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeExclusion, BlendModeExclusion); |
| 674 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeHue, BlendModeHue); |
| 675 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeSaturation, BlendModeSaturation); |
| 676 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeColor, BlendModeColor); |
| 677 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeLuminosity, BlendModeLuminosity); |
| 678 |
661 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonUnknown, CompositingReasonNone); | 679 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonUnknown, CompositingReasonNone); |
662 COMPILE_ASSERT_MATCHING_UINT64(CompositingReason3DTransform, CompositingReason3D
Transform); | 680 COMPILE_ASSERT_MATCHING_UINT64(CompositingReason3DTransform, CompositingReason3D
Transform); |
663 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonVideo, CompositingReasonVideo); | 681 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonVideo, CompositingReasonVideo); |
664 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonCanvas, CompositingReasonCanvas)
; | 682 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonCanvas, CompositingReasonCanvas)
; |
665 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPlugin, CompositingReasonPlugin)
; | 683 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPlugin, CompositingReasonPlugin)
; |
666 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIFrame, CompositingReasonIFrame)
; | 684 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIFrame, CompositingReasonIFrame)
; |
667 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonBackfaceVisibilityHidden, Compos
itingReasonBackfaceVisibilityHidden); | 685 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonBackfaceVisibilityHidden, Compos
itingReasonBackfaceVisibilityHidden); |
668 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonAnimation, CompositingReasonAnim
ation); | 686 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonAnimation, CompositingReasonAnim
ation); |
669 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonFilters, CompositingReasonFilter
s); | 687 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonFilters, CompositingReasonFilter
s); |
670 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPositionFixed, CompositingReason
PositionFixed); | 688 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPositionFixed, CompositingReason
PositionFixed); |
(...skipping 14 matching lines...) Expand all Loading... |
685 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonReflectionOfCompositedParent, Co
mpositingReasonReflectionOfCompositedParent); | 703 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonReflectionOfCompositedParent, Co
mpositingReasonReflectionOfCompositedParent); |
686 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); | 704 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); |
687 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); | 705 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); |
688 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); | 706 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); |
689 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); | 707 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); |
690 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); | 708 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); |
691 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); | 709 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); |
692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); | 710 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); |
693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); | 711 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); |
694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); | 712 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); |
| 713 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIsolateCompositedDescendants, Co
mpositingReasonIsolateCompositedDescendants); |
695 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 714 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
OLD | NEW |