chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc - Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc

Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h ('k') | chrome/browser/renderer_host/buffered_resource_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc

diff --git a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc

index 1ad09ba02c5eb16c1acf43f93de0586a6bbe905f..a96782bb1b6b0207bc6dbaef1a7cf4c1657bdcad 100644

--- a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc

+++ b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc

@@ -6,7 +6,7 @@

#include "base/logging.h"

#include "chrome/browser/renderer_host/accelerated_surface_container_mac.h"

-#include "webkit/glue/plugins/webplugin.h"

+#include "webkit/plugins/npapi/webplugin.h"

AcceleratedSurfaceContainerManagerMac::AcceleratedSurfaceContainerManagerMac()

: current_id_(0),

@@ -86,7 +86,7 @@ void AcceleratedSurfaceContainerManagerMac::SetSizeAndTransportDIB(

}

void AcceleratedSurfaceContainerManagerMac::SetPluginContainerGeometry(

- const webkit_glue::WebPluginGeometry& move) {

+ const webkit::npapi::WebPluginGeometry& move) {

AutoLock lock(lock_);

AcceleratedSurfaceContainerMac* container = MapIDToContainer(move.window);