Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: third_party/WebKit/Source/web/AssertMatchingEnums.cpp

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments for tests + merge blink/cr changes. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/AssertMatchingEnums.cpp
diff --git a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
index 259083b7741d9a3e38e1ac7b8ac3cc4fe5e24355..d7855047c8d1fdb5af7845a33940b4c58c37f283 100644
--- a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
+++ b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
@@ -449,6 +449,10 @@ STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight900, FontWeight900);
STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::WeightNormal, FontWeightNormal);
STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold);
+STATIC_ASSERT_MATCHING_ENUM(WebFrameOwnerProperties::ScrollingMode::Auto, ScrollbarAuto);
+STATIC_ASSERT_MATCHING_ENUM(WebFrameOwnerProperties::ScrollingMode::AlwaysOff, ScrollbarAlwaysOff);
+STATIC_ASSERT_MATCHING_ENUM(WebFrameOwnerProperties::ScrollingMode::AlwaysOn, ScrollbarAlwaysOn);
+
STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeInvalid, InvalidIcon);
STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeFavicon, Favicon);
STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouch, TouchIcon);

Powered by Google App Engine
This is Rietveld 408576698