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

Side by Side Diff: cc/blink/web_layer_impl.cc

Issue 1604053002: cc: Fix enum style conformance in InputHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | cc/input/input_handler.h » ('j') | cc/input/main_thread_scrolling_reason.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/blink/web_layer_impl.h" 5 #include "cc/blink/web_layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 338 }
339 339
340 void WebLayerImpl::setHaveScrollEventHandlers(bool have_scroll_event_handlers) { 340 void WebLayerImpl::setHaveScrollEventHandlers(bool have_scroll_event_handlers) {
341 layer_->SetHaveScrollEventHandlers(have_scroll_event_handlers); 341 layer_->SetHaveScrollEventHandlers(have_scroll_event_handlers);
342 } 342 }
343 343
344 bool WebLayerImpl::haveScrollEventHandlers() const { 344 bool WebLayerImpl::haveScrollEventHandlers() const {
345 return layer_->have_scroll_event_handlers(); 345 return layer_->have_scroll_event_handlers();
346 } 346 }
347 347
348 static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>( 348 static_assert(blink::WebMainThreadScrollingReason::NotScrollingOnMain ==
349 blink::WebMainThreadScrollingReason::NotScrollingOnMain) == 349 cc::MainThreadScrollingReason::kNotScrollingOnMain,
350 cc::InputHandler::NOT_SCROLLING_ON_MAIN, 350 "MainThreadScrollingReason and "
351 "InputHandler::MainThreadScrollingReason and "
352 "WebMainThreadScrollingReason enums must match");
353 static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>(
354 blink::WebMainThreadScrollingReason::
355 HasBackgroundAttachmentFixedObjects) ==
356 cc::InputHandler::HAS_BACKGROUND_ATTACHMENT_FIXED_OBJECTS,
357 "InputHandler::MainThreadScrollingReason and "
358 "WebMainThreadScrollingReason enums must match");
359 static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>(
360 blink::WebMainThreadScrollingReason::
361 HasNonLayerViewportConstrainedObjects) ==
362 cc::InputHandler::HAS_NON_LAYER_VIEWPORT_CONSTRAINED_OBJECTS,
363 "InputHandler::MainThreadScrollingReason and "
364 "WebMainThreadScrollingReason enums must match"); 351 "WebMainThreadScrollingReason enums must match");
365 static_assert( 352 static_assert(
366 static_cast<cc::InputHandler::MainThreadScrollingReason>( 353 blink::WebMainThreadScrollingReason::HasBackgroundAttachmentFixedObjects ==
367 blink::WebMainThreadScrollingReason::ThreadedScrollingDisabled) == 354 cc::MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects,
368 cc::InputHandler::THREADED_SCROLLING_DISABLED, 355 "MainThreadScrollingReason and "
369 "InputHandler::MainThreadScrollingReason and "
370 "WebMainThreadScrollingReason enums must match"); 356 "WebMainThreadScrollingReason enums must match");
371 static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>( 357 static_assert(
372 blink::WebMainThreadScrollingReason::ScrollBarScrolling) == 358 blink::WebMainThreadScrollingReason::
373 cc::InputHandler::SCROLL_BAR_SCROLLING, 359 HasNonLayerViewportConstrainedObjects ==
374 "InputHandler::MainThreadScrollingReason and " 360 cc::MainThreadScrollingReason::kHasNonLayerViewportConstrainedObjects,
361 "MainThreadScrollingReason and "
362 "WebMainThreadScrollingReason enums must match");
363 static_assert(
364
365 blink::WebMainThreadScrollingReason::ThreadedScrollingDisabled ==
366 cc::MainThreadScrollingReason::kThreadedScrollingDisabled,
367 "MainThreadScrollingReason and "
368 "WebMainThreadScrollingReason enums must match");
369 static_assert(blink::WebMainThreadScrollingReason::ScrollBarScrolling ==
370 cc::MainThreadScrollingReason::kScrollbarScrolling,
371 "MainThreadScrollingReason and "
375 "WebMainThreadScrollingReason enums must match"); 372 "WebMainThreadScrollingReason enums must match");
376 static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>( 373 static_assert(blink::WebMainThreadScrollingReason::PageOverlay ==
377 blink::WebMainThreadScrollingReason::PageOverlay) == 374 cc::MainThreadScrollingReason::kPageOverlay,
378 cc::InputHandler::PAGE_OVERLAY, 375 "MainThreadScrollingReason and "
379 "InputHandler::MainThreadScrollingReason and "
380 "WebMainThreadScrollingReason enums must match"); 376 "WebMainThreadScrollingReason enums must match");
381 377
382 void WebLayerImpl::addMainThreadScrollingReasons( 378 void WebLayerImpl::addMainThreadScrollingReasons(
383 blink::WebMainThreadScrollingReason::WebMainThreadScrollingReason 379 blink::WebMainThreadScrollingReason::WebMainThreadScrollingReason
384 main_thread_scrolling_reasons) { 380 main_thread_scrolling_reasons) {
385 DCHECK(main_thread_scrolling_reasons); 381 DCHECK(main_thread_scrolling_reasons);
386 // WebLayerImpl should only know about non-transient scrolling 382 // WebLayerImpl should only know about non-transient scrolling
387 // reasons. Transient scrolling reasons are computed per hit test. 383 // reasons. Transient scrolling reasons are computed per hit test.
388 DCHECK_LE( 384 DCHECK_LE(
389 main_thread_scrolling_reasons, 385 main_thread_scrolling_reasons,
390 static_cast< 386 static_cast<
391 blink::WebMainThreadScrollingReason::WebMainThreadScrollingReason>( 387 blink::WebMainThreadScrollingReason::WebMainThreadScrollingReason>(
392 cc::InputHandler::MaxNonTransientScrollingReason)); 388 cc::MainThreadScrollingReason::kMaxNonTransientScrollingReason));
393 layer_->AddMainThreadScrollingReasons( 389 layer_->AddMainThreadScrollingReasons(main_thread_scrolling_reasons);
394 static_cast<cc::InputHandler::MainThreadScrollingReason>(
395 main_thread_scrolling_reasons));
396 } 390 }
397 391
398 void WebLayerImpl::clearMainThreadScrollingReasons() { 392 void WebLayerImpl::clearMainThreadScrollingReasons() {
399 layer_->ClearMainThreadScrollingReasons(); 393 layer_->ClearMainThreadScrollingReasons();
400 } 394 }
401 395
402 bool WebLayerImpl::shouldScrollOnMainThread() const { 396 bool WebLayerImpl::shouldScrollOnMainThread() const {
403 return layer_->should_scroll_on_main_thread(); 397 return layer_->should_scroll_on_main_thread();
404 } 398 }
405 399
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 612
619 Layer* WebLayerImpl::layer() const { 613 Layer* WebLayerImpl::layer() const {
620 return layer_.get(); 614 return layer_.get();
621 } 615 }
622 616
623 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) { 617 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) {
624 contents_opaque_is_fixed_ = fixed; 618 contents_opaque_is_fixed_ = fixed;
625 } 619 }
626 620
627 } // namespace cc_blink 621 } // namespace cc_blink
OLDNEW
« no previous file with comments | « no previous file | cc/input/input_handler.h » ('j') | cc/input/main_thread_scrolling_reason.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698