third_party/WebKit/WebKit/mac/Plugins/WebNetscapePluginView.mm - Issue 10670: Do another merge using nifty new merge script (CL for that coming soon).

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: third_party/WebKit/WebKit/mac/Plugins/WebNetscapePluginView.mm

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/WebKit/mac/Plugins/WebNetscapePluginView.mm

===================================================================

--- third_party/WebKit/WebKit/mac/Plugins/WebNetscapePluginView.mm (revision 5296)

+++ third_party/WebKit/WebKit/mac/Plugins/WebNetscapePluginView.mm (working copy)

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

#ifndef BUILDING_ON_TIGER

if (drawingModel == NPDrawingModelCoreAnimation) {

void *value = 0;

- if (![_pluginPackage.get() pluginFuncs]->getvalue(plugin, NPPVpluginCoreAnimationLayer, &value) == NPERR_NO_ERROR && value) {

+ if ([_pluginPackage.get() pluginFuncs]->getvalue(plugin, NPPVpluginCoreAnimationLayer, &value) == NPERR_NO_ERROR && value) {

// The plug-in gives us a retained layer.

_layer.adoptNS((CALayer *)value);