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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Jay's comments and rebase Created 8 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 new IndexedDBDispatcherHost( 536 new IndexedDBDispatcherHost(
537 GetID(), 537 GetID(),
538 storage_partition_impl_->GetIndexedDBContext())); 538 storage_partition_impl_->GetIndexedDBContext()));
539 channel_->AddFilter(GeolocationDispatcherHost::New( 539 channel_->AddFilter(GeolocationDispatcherHost::New(
540 GetID(), browser_context->GetGeolocationPermissionContext())); 540 GetID(), browser_context->GetGeolocationPermissionContext()));
541 gpu_message_filter_ = new GpuMessageFilter(GetID(), widget_helper_.get()); 541 gpu_message_filter_ = new GpuMessageFilter(GetID(), widget_helper_.get());
542 channel_->AddFilter(gpu_message_filter_); 542 channel_->AddFilter(gpu_message_filter_);
543 #if defined(ENABLE_WEBRTC) 543 #if defined(ENABLE_WEBRTC)
544 channel_->AddFilter(new MediaStreamDispatcherHost(GetID())); 544 channel_->AddFilter(new MediaStreamDispatcherHost(GetID()));
545 #endif 545 #endif
546 #if defined(ENABLE_PPAPI)
546 channel_->AddFilter( 547 channel_->AddFilter(
547 GetContentClient()->browser()->AllowPepperPrivateFileAPI() ? 548 GetContentClient()->browser()->AllowPepperPrivateFileAPI() ?
548 new PepperUnsafeFileMessageFilter( 549 new PepperUnsafeFileMessageFilter(
549 GetID(), 550 GetID(),
550 storage_partition_impl_->GetPath()) : 551 storage_partition_impl_->GetPath()) :
551 new PepperFileMessageFilter(GetID())); 552 new PepperFileMessageFilter(GetID()));
552 channel_->AddFilter(new PepperMessageFilter(PepperMessageFilter::RENDERER, 553 channel_->AddFilter(new PepperMessageFilter(PepperMessageFilter::RENDERER,
553 GetID(), browser_context)); 554 GetID(), browser_context));
555 #endif
554 #if defined(ENABLE_INPUT_SPEECH) 556 #if defined(ENABLE_INPUT_SPEECH)
555 channel_->AddFilter(new InputTagSpeechDispatcherHost( 557 channel_->AddFilter(new InputTagSpeechDispatcherHost(
556 IsGuest(), GetID(), storage_partition_impl_->GetURLRequestContext(), 558 IsGuest(), GetID(), storage_partition_impl_->GetURLRequestContext(),
557 browser_context->GetSpeechRecognitionPreferences())); 559 browser_context->GetSpeechRecognitionPreferences()));
558 channel_->AddFilter(new SpeechRecognitionDispatcherHost( 560 channel_->AddFilter(new SpeechRecognitionDispatcherHost(
559 GetID(), storage_partition_impl_->GetURLRequestContext(), 561 GetID(), storage_partition_impl_->GetURLRequestContext(),
560 browser_context->GetSpeechRecognitionPreferences())); 562 browser_context->GetSpeechRecognitionPreferences()));
561 #endif 563 #endif
562 channel_->AddFilter(new FileAPIMessageFilter( 564 channel_->AddFilter(new FileAPIMessageFilter(
563 GetID(), 565 GetID(),
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 int32 gpu_process_host_id) { 1584 int32 gpu_process_host_id) {
1583 TRACE_EVENT0("renderer_host", 1585 TRACE_EVENT0("renderer_host",
1584 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1586 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1585 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1587 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1586 gpu_process_host_id, 1588 gpu_process_host_id,
1587 false, 1589 false,
1588 0); 1590 0);
1589 } 1591 }
1590 1592
1591 } // namespace content 1593 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698