| Index: android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| index 33b2f4f4ad2ae52b7c07b2835d47d1d389b86946..5df224c15c1acabdbc449ef1bb199aad820877cc 100644
|
| --- a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| +++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| @@ -32,11 +32,12 @@ AwRenderViewHostExt::AwRenderViewHostExt(
|
| }
|
|
|
| AwRenderViewHostExt::~AwRenderViewHostExt() {
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| ClearImageRequests();
|
| }
|
|
|
| void AwRenderViewHostExt::DocumentHasImages(DocumentHasImagesResult result) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (!web_contents()->GetRenderViewHost()) {
|
| result.Run(false);
|
| return;
|
| @@ -56,12 +57,12 @@ void AwRenderViewHostExt::DocumentHasImages(DocumentHasImagesResult result) {
|
| }
|
|
|
| void AwRenderViewHostExt::ClearCache() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| Send(new AwViewMsg_ClearCache);
|
| }
|
|
|
| void AwRenderViewHostExt::KillRenderProcess() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| Send(new AwViewMsg_KillProcess);
|
| }
|
|
|
| @@ -76,7 +77,7 @@ void AwRenderViewHostExt::MarkHitTestDataRead() {
|
| void AwRenderViewHostExt::RequestNewHitTestDataAt(
|
| const gfx::PointF& touch_center,
|
| const gfx::SizeF& touch_area) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| // We only need to get blink::WebView on the renderer side to invoke the
|
| // blink hit test API, so sending this IPC to main frame is enough.
|
| Send(new AwViewMsg_DoHitTest(web_contents()->GetMainFrame()->GetRoutingID(),
|
| @@ -84,24 +85,24 @@ void AwRenderViewHostExt::RequestNewHitTestDataAt(
|
| }
|
|
|
| const AwHitTestData& AwRenderViewHostExt::GetLastHitTestData() const {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| return last_hit_test_data_;
|
| }
|
|
|
| void AwRenderViewHostExt::SetTextZoomFactor(float factor) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| Send(new AwViewMsg_SetTextZoomFactor(
|
| web_contents()->GetMainFrame()->GetRoutingID(), factor));
|
| }
|
|
|
| void AwRenderViewHostExt::ResetScrollAndScaleState() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| Send(new AwViewMsg_ResetScrollAndScaleState(
|
| web_contents()->GetMainFrame()->GetRoutingID()));
|
| }
|
|
|
| void AwRenderViewHostExt::SetInitialPageScale(double page_scale_factor) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| Send(new AwViewMsg_SetInitialPageScale(
|
| web_contents()->GetMainFrame()->GetRoutingID(), page_scale_factor));
|
| }
|
| @@ -158,7 +159,7 @@ void AwRenderViewHostExt::RenderFrameCreated(
|
|
|
| void AwRenderViewHostExt::DidFinishNavigation(
|
| content::NavigationHandle* navigation_handle) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (!navigation_handle->HasCommitted() ||
|
| (!navigation_handle->IsInMainFrame() &&
|
| !navigation_handle->HasSubframeNavigationEntryCommitted()))
|
| @@ -201,7 +202,7 @@ void AwRenderViewHostExt::OnDocumentHasImagesResponse(
|
| if (render_frame_host != web_contents()->GetMainFrame())
|
| return;
|
|
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| std::map<int, DocumentHasImagesResult>::iterator pending_req =
|
| image_requests_callback_map_.find(msg_id);
|
| if (pending_req == image_requests_callback_map_.end()) {
|
| @@ -224,7 +225,7 @@ void AwRenderViewHostExt::OnUpdateHitTestData(
|
| if (main_frame_host != web_contents()->GetMainFrame())
|
| return;
|
|
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| last_hit_test_data_ = hit_test_data;
|
| has_new_hit_test_data_ = true;
|
| }
|
|
|