| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 #include "core/dom/IconURL.h" | 67 #include "core/dom/IconURL.h" |
| 68 #include "core/editing/EditorInsertAction.h" | 68 #include "core/editing/EditorInsertAction.h" |
| 69 #include "core/editing/TextAffinity.h" | 69 #include "core/editing/TextAffinity.h" |
| 70 #include "core/fileapi/FileError.h" | 70 #include "core/fileapi/FileError.h" |
| 71 #include "core/html/HTMLFormElement.h" | 71 #include "core/html/HTMLFormElement.h" |
| 72 #include "core/html/HTMLInputElement.h" | 72 #include "core/html/HTMLInputElement.h" |
| 73 #include "core/html/shadow/TextControlInnerElements.h" | 73 #include "core/html/shadow/TextControlInnerElements.h" |
| 74 #include "core/loader/NavigationPolicy.h" | 74 #include "core/loader/NavigationPolicy.h" |
| 75 #include "core/loader/appcache/ApplicationCacheHost.h" | 75 #include "core/loader/appcache/ApplicationCacheHost.h" |
| 76 #include "core/page/ContentSecurityPolicy.h" | 76 #include "core/page/ContentSecurityPolicy.h" |
| 77 #include "core/page/InjectedStyleSheet.h" |
| 77 #include "core/page/PageVisibilityState.h" | 78 #include "core/page/PageVisibilityState.h" |
| 78 #include "core/page/Settings.h" | 79 #include "core/page/Settings.h" |
| 79 #include "core/page/UserContentTypes.h" | |
| 80 #include "core/page/UserStyleSheetTypes.h" | |
| 81 #include "core/platform/Cursor.h" | 80 #include "core/platform/Cursor.h" |
| 82 #include "core/platform/FileMetadata.h" | 81 #include "core/platform/FileMetadata.h" |
| 83 #include "core/platform/graphics/ContentDecryptionModuleSession.h" | 82 #include "core/platform/graphics/ContentDecryptionModuleSession.h" |
| 84 #include "core/platform/graphics/FontDescription.h" | 83 #include "core/platform/graphics/FontDescription.h" |
| 85 #include "core/platform/graphics/FontSmoothingMode.h" | 84 #include "core/platform/graphics/FontSmoothingMode.h" |
| 86 #include "core/platform/graphics/InbandTextTrackPrivate.h" | 85 #include "core/platform/graphics/InbandTextTrackPrivate.h" |
| 87 #include "core/platform/graphics/MediaPlayer.h" | 86 #include "core/platform/graphics/MediaPlayer.h" |
| 88 #include "core/platform/graphics/MediaSourcePrivate.h" | 87 #include "core/platform/graphics/MediaSourcePrivate.h" |
| 89 #include "core/platform/graphics/filters/FilterOperation.h" | 88 #include "core/platform/graphics/filters/FilterOperation.h" |
| 90 #include "core/platform/mediastream/MediaStreamSource.h" | 89 #include "core/platform/mediastream/MediaStreamSource.h" |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollbarOverlayStyleLight, Scrollbar
OverlayStyleLight); | 498 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollbarOverlayStyleLight, Scrollbar
OverlayStyleLight); |
| 500 | 499 |
| 501 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorMac, EditingMacBehavior
); | 500 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorMac, EditingMacBehavior
); |
| 502 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorWin, EditingWindowsBeha
vior); | 501 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorWin, EditingWindowsBeha
vior); |
| 503 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorUnix, EditingUnixBehavi
or); | 502 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorUnix, EditingUnixBehavi
or); |
| 504 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorAndroid, EditingAndroid
Behavior); | 503 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::EditingBehaviorAndroid, EditingAndroid
Behavior); |
| 505 | 504 |
| 506 COMPILE_ASSERT_MATCHING_ENUM(WebTextAffinityUpstream, UPSTREAM); | 505 COMPILE_ASSERT_MATCHING_ENUM(WebTextAffinityUpstream, UPSTREAM); |
| 507 COMPILE_ASSERT_MATCHING_ENUM(WebTextAffinityDownstream, DOWNSTREAM); | 506 COMPILE_ASSERT_MATCHING_ENUM(WebTextAffinityDownstream, DOWNSTREAM); |
| 508 | 507 |
| 509 COMPILE_ASSERT_MATCHING_ENUM(WebView::UserContentInjectInAllFrames, InjectInAllF
rames); | 508 COMPILE_ASSERT_MATCHING_ENUM(WebView::InjectStyleInAllFrames, InjectStyleInAllFr
ames); |
| 510 COMPILE_ASSERT_MATCHING_ENUM(WebView::UserContentInjectInTopFrameOnly, InjectInT
opFrameOnly); | 509 COMPILE_ASSERT_MATCHING_ENUM(WebView::InjectStyleInTopFrameOnly, InjectStyleInTo
pFrameOnly); |
| 511 COMPILE_ASSERT_MATCHING_ENUM(WebView::UserStyleInjectInExistingDocuments, Inject
InExistingDocuments); | |
| 512 COMPILE_ASSERT_MATCHING_ENUM(WebView::UserStyleInjectInSubsequentDocuments, Inje
ctInSubsequentDocuments); | |
| 513 | 510 |
| 514 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionUnknownError, UnknownError); | 511 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionUnknownError, UnknownError); |
| 515 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionConstraintError, ConstraintE
rror); | 512 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionConstraintError, ConstraintE
rror); |
| 516 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionDataError, DataError); | 513 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionDataError, DataError); |
| 517 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionVersionError, VersionError); | 514 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionVersionError, VersionError); |
| 518 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionAbortError, AbortError); | 515 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionAbortError, AbortError); |
| 519 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionQuotaError, QuotaExceededErr
or); | 516 COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionQuotaError, QuotaExceededErr
or); |
| 520 | 517 |
| 521 COMPILE_ASSERT_MATCHING_ENUM(WebIDBKeyTypeInvalid, IDBKey::InvalidType); | 518 COMPILE_ASSERT_MATCHING_ENUM(WebIDBKeyTypeInvalid, IDBKey::InvalidType); |
| 522 COMPILE_ASSERT_MATCHING_ENUM(WebIDBKeyTypeArray, IDBKey::ArrayType); | 519 COMPILE_ASSERT_MATCHING_ENUM(WebIDBKeyTypeArray, IDBKey::ArrayType); |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); | 690 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonRoot, CompositingReasonRoot); |
| 694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); | 691 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForClip, CompositingReasonL
ayerForClip); |
| 695 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); | 692 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollbar, CompositingRe
asonLayerForScrollbar); |
| 696 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); | 693 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForScrollingContainer, Comp
ositingReasonLayerForScrollingContainer); |
| 697 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); | 694 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForForeground, CompositingR
easonLayerForForeground); |
| 698 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); | 695 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForBackground, CompositingR
easonLayerForBackground); |
| 699 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); | 696 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonLayerForMask, CompositingReasonL
ayerForMask); |
| 700 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); | 697 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOverflowScrollingParent, Composi
tingReasonOverflowScrollingParent); |
| 701 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); | 698 COMPILE_ASSERT_MATCHING_UINT64(CompositingReasonOutOfFlowClipping, CompositingRe
asonOutOfFlowClipping); |
| 702 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); | 699 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa
lue::wireFormatVersion); |
| OLD | NEW |