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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 2 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 unified diff | Download patch
« content/renderer/render_frame_impl.cc ('K') | « third_party/WebKit/Source/core/loader/FrameLoaderClient.h ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.h » ('j') | third_party/WebKit/public/web/WebFrame.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight300, FontWeight300); 442 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight300, FontWeight300);
443 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight400, FontWeight400); 443 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight400, FontWeight400);
444 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight500, FontWeight500); 444 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight500, FontWeight500);
445 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight600, FontWeight600); 445 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight600, FontWeight600);
446 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight700, FontWeight700); 446 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight700, FontWeight700);
447 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight800, FontWeight800); 447 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight800, FontWeight800);
448 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight900, FontWeight900); 448 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::Weight900, FontWeight900);
449 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::WeightNormal, FontWeightNormal); 449 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::WeightNormal, FontWeightNormal);
450 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold); 450 STATIC_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold);
451 451
452 STATIC_ASSERT_MATCHING_ENUM(WebFrameOwnerProperties::ScrollingMode::Auto, Scroll barAuto);
453 STATIC_ASSERT_MATCHING_ENUM(WebFrameOwnerProperties::ScrollingMode::AlwaysOff, S crollbarAlwaysOff);
454 STATIC_ASSERT_MATCHING_ENUM(WebFrameOwnerProperties::ScrollingMode::AlwaysOn, Sc rollbarAlwaysOn);
455
452 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeInvalid, InvalidIcon); 456 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeInvalid, InvalidIcon);
453 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeFavicon, Favicon); 457 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeFavicon, Favicon);
454 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouch, TouchIcon); 458 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouch, TouchIcon);
455 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouchPrecomposed, TouchPrecomposedIc on); 459 STATIC_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouchPrecomposed, TouchPrecomposedIc on);
456 460
457 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveNothing, HTMLMediaElem ent::HAVE_NOTHING); 461 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveNothing, HTMLMediaElem ent::HAVE_NOTHING);
458 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, HTMLMediaEle ment::HAVE_METADATA); 462 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, HTMLMediaEle ment::HAVE_METADATA);
459 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, HTMLMedia Element::HAVE_CURRENT_DATA); 463 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, HTMLMedia Element::HAVE_CURRENT_DATA);
460 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, HTMLMediaE lement::HAVE_FUTURE_DATA); 464 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, HTMLMediaE lement::HAVE_FUTURE_DATA);
461 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, HTMLMediaE lement::HAVE_ENOUGH_DATA); 465 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, HTMLMediaE lement::HAVE_ENOUGH_DATA);
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeR eplaceCurrentItem); 710 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeR eplaceCurrentItem);
707 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadType InitialInChildFrame); 711 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadType InitialInChildFrame);
708 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeI nitialHistoryLoad); 712 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeI nitialHistoryLoad);
709 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReloadFromOrigin, FrameLoadTypeRel oadFromOrigin); 713 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReloadFromOrigin, FrameLoadTypeRel oadFromOrigin);
710 714
711 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType: :Remove); 715 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType: :Remove);
712 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::S wap); 716 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::S wap);
713 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::Detac hType::Remove); 717 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::Detac hType::Remove);
714 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachT ype::Swap); 718 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachT ype::Swap);
715 } // namespace blink 719 } // namespace blink
OLDNEW
« content/renderer/render_frame_impl.cc ('K') | « third_party/WebKit/Source/core/loader/FrameLoaderClient.h ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.h » ('j') | third_party/WebKit/public/web/WebFrame.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698