chrome/browser/renderer_host/accelerated_surface_container_mac.cc - Issue 5998002: Revert "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_mac.cc

Issue 5998002: Revert "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_mac.h ('k') | chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/accelerated_surface_container_mac.cc

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

index f379931c4d23d88deb803354f3f670558c414b20..1a7c07c5768d02d8fb15861e8fe2f2555b1dca7f 100644

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

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

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

#include "app/surface/io_surface_support_mac.h"

#include "base/logging.h"

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

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

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

AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac(

AcceleratedSurfaceContainerManagerMac* manager,

@@ -51,7 +51,7 @@ void AcceleratedSurfaceContainerMac::SetSizeAndTransportDIB(

}

void AcceleratedSurfaceContainerMac::SetGeometry(

- const webkit::npapi::WebPluginGeometry& geom) {

+ const webkit_glue::WebPluginGeometry& geom) {

visible_ = geom.visible;

if (geom.rects_valid)

clip_rect_ = geom.clip_rect;