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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 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
« no previous file with comments | « content/renderer/pepper/pepper_video_encoder_host.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 0aa844163910f5428b1d7d618f7c73c763af24a6..d61f997393b2216bb3c4e3f1ae550cf5ee0fa71f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -300,7 +300,7 @@ using blink::WebFloatPoint;
using blink::WebFloatRect;
#endif
-#define STATIC_ASSERT_ENUM(a, b) \
+#define STATIC_ASSERT_RENDER_ENUM(a, b) \
static_assert(static_cast<int>(a) == static_cast<int>(b), \
"mismatching enums: " #a)
@@ -5794,11 +5794,11 @@ void RenderFrameImpl::OnClearActiveFindMatch() {
// Ensure that content::StopFindAction and blink::WebLocalFrame::StopFindAction
// are kept in sync.
-STATIC_ASSERT_ENUM(STOP_FIND_ACTION_CLEAR_SELECTION,
+STATIC_ASSERT_RENDER_ENUM(STOP_FIND_ACTION_CLEAR_SELECTION,
WebLocalFrame::kStopFindActionClearSelection);
-STATIC_ASSERT_ENUM(STOP_FIND_ACTION_KEEP_SELECTION,
+STATIC_ASSERT_RENDER_ENUM(STOP_FIND_ACTION_KEEP_SELECTION,
WebLocalFrame::kStopFindActionKeepSelection);
-STATIC_ASSERT_ENUM(STOP_FIND_ACTION_ACTIVATE_SELECTION,
+STATIC_ASSERT_RENDER_ENUM(STOP_FIND_ACTION_ACTIVATE_SELECTION,
WebLocalFrame::kStopFindActionActivateSelection);
void RenderFrameImpl::OnStopFinding(StopFindAction action) {
« no previous file with comments | « content/renderer/pepper/pepper_video_encoder_host.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698