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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 #include "platform/drm/ContentDecryptionModuleSession.h" | 90 #include "platform/drm/ContentDecryptionModuleSession.h" |
91 #include "platform/fonts/FontDescription.h" | 91 #include "platform/fonts/FontDescription.h" |
92 #include "platform/fonts/FontSmoothingMode.h" | 92 #include "platform/fonts/FontSmoothingMode.h" |
93 #include "platform/graphics/media/MediaPlayer.h" | 93 #include "platform/graphics/media/MediaPlayer.h" |
94 #include "platform/mediastream/MediaStreamSource.h" | 94 #include "platform/mediastream/MediaStreamSource.h" |
95 #include "platform/network/ResourceLoadPriority.h" | 95 #include "platform/network/ResourceLoadPriority.h" |
96 #include "platform/network/ResourceResponse.h" | 96 #include "platform/network/ResourceResponse.h" |
97 #include "platform/text/TextChecking.h" | 97 #include "platform/text/TextChecking.h" |
98 #include "platform/text/TextDecoration.h" | 98 #include "platform/text/TextDecoration.h" |
99 #include "platform/weborigin/ReferrerPolicy.h" | 99 #include "platform/weborigin/ReferrerPolicy.h" |
| 100 #include "public/platform/WebBlendMode.h" |
100 #include "public/platform/WebClipboard.h" | 101 #include "public/platform/WebClipboard.h" |
101 #include "public/platform/WebCompositingReasons.h" | 102 #include "public/platform/WebCompositingReasons.h" |
102 #include "public/platform/WebCursorInfo.h" | 103 #include "public/platform/WebCursorInfo.h" |
103 #include "public/platform/WebFileError.h" | 104 #include "public/platform/WebFileError.h" |
104 #include "public/platform/WebFileInfo.h" | 105 #include "public/platform/WebFileInfo.h" |
105 #include "public/platform/WebFileSystem.h" | 106 #include "public/platform/WebFileSystem.h" |
106 #include "public/platform/WebIDBCursor.h" | 107 #include "public/platform/WebIDBCursor.h" |
107 #include "public/platform/WebIDBDatabase.h" | 108 #include "public/platform/WebIDBDatabase.h" |
108 #include "public/platform/WebIDBDatabaseException.h" | 109 #include "public/platform/WebIDBDatabaseException.h" |
109 #include "public/platform/WebIDBFactory.h" | 110 #include "public/platform/WebIDBFactory.h" |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
639 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewForegroundTab, NavigationPoli
cyNewForegroundTab); | 640 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewForegroundTab, NavigationPoli
cyNewForegroundTab); |
640 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewWindow, NavigationPolicyNewWi
ndow); | 641 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewWindow, NavigationPolicyNewWi
ndow); |
641 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewPopup, NavigationPolicyNewPop
up); | 642 COMPILE_ASSERT_MATCHING_ENUM(WebNavigationPolicyNewPopup, NavigationPolicyNewPop
up); |
642 | 643 |
643 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel); | 644 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel); |
644 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); | 645 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); |
645 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve
l); | 646 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve
l); |
646 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); | 647 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); |
647 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel); | 648 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel); |
648 | 649 |
| 650 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeNormal, BlendModeNormal); |
| 651 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeMultiply, BlendModeMultiply); |
| 652 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeScreen, BlendModeScreen); |
| 653 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeOverlay, BlendModeOverlay); |
| 654 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeDarken, BlendModeDarken); |
| 655 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeLighten, BlendModeLighten); |
| 656 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeColorDodge, BlendModeColorDodge); |
| 657 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeColorBurn, BlendModeColorBurn); |
| 658 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeHardLight, BlendModeHardLight); |
| 659 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeSoftLight, BlendModeSoftLight); |
| 660 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeDifference, BlendModeDifference); |
| 661 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeExclusion, BlendModeExclusion); |
| 662 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeHue, BlendModeHue); |
| 663 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeSaturation, BlendModeSaturation); |
| 664 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeColor, BlendModeColor); |
| 665 COMPILE_ASSERT_MATCHING_ENUM(WebBlendModeLuminosity, BlendModeLuminosity); |
| 666 |
649 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonUnknown, CompositingReasonNone); | 667 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonUnknown, CompositingReasonNone); |
650 COMPILE_ASSERT_MATCHING_UINT64(CompositingReason3DTransform, CompositingReason3D
Transform); | 668 COMPILE_ASSERT_MATCHING_UINT64(CompositingReason3DTransform, CompositingReason3D
Transform); |
651 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonVideo, CompositingReasonVideo); | 669 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonVideo, CompositingReasonVideo); |
652 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonCanvas, CompositingReasonCanvas)
; | 670 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonCanvas, CompositingReasonCanvas)
; |
653 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPlugin, CompositingReasonPlugin)
; | 671 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPlugin, CompositingReasonPlugin)
; |
654 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIFrame, CompositingReasonIFrame)
; | 672 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIFrame, CompositingReasonIFrame)
; |
655 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonBackfaceVisibilityHidden, Compos
itingReasonBackfaceVisibilityHidden); | 673 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonBackfaceVisibilityHidden, Compos
itingReasonBackfaceVisibilityHidden); |
656 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonAnimation, CompositingReasonAnim
ation); | 674 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonAnimation, CompositingReasonAnim
ation); |
657 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonFilters, CompositingReasonFilter
s); | 675 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonFilters, CompositingReasonFilter
s); |
658 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPositionFixed, CompositingReason
PositionFixed); | 676 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonPositionFixed, CompositingReason
PositionFixed); |
(...skipping 14 matching lines...) Expand all Loading... |
673 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonReflectionOfCompositedParent, Co
mpositingReasonReflectionOfCompositedParent); | 691 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonReflectionOfCompositedParent, Co
mpositingReasonReflectionOfCompositedParent); |
674 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); | 692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); |
675 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); | 693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); |
676 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); | 694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); |
677 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); | 695 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); |
678 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); | 696 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); |
679 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); | 697 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); |
680 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); | 698 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); |
681 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); | 699 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); |
682 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); | 700 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); |
| 701 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonIsolateCompositedDescendants, Co
mpositingReasonIsolateCompositedDescendants); |
683 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 702 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
OLD | NEW |