710511 - Rename ANP DrawingModel to prevent conflict with AsyncDrawingModel

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Bas Schouten (:bas.schouten)]

Attachment: Rename DrawingModel to ANPDrawingModel

We're adding NPAPI async drawing code in a cross-platform manner in bug 651192. Recently we landed code that makes an android specific internal 'DrawingModel', that isn't based on the NPDrawingModel enumeration. We should rename this to not conflict with the new things we're adding based on the existing NPDrawingModel enum.

This patch I have is untested for lack of a current Android build env.

Comment 1

[James Willcox (:snorp) ([e-mail]) (he/him)]

Attachment: Fixed up version of Bas' patch

Comment 2

[James Willcox (:snorp) ([e-mail]) (he/him)]

Comment on attachment 581514 [details] [diff] [review]
Rename DrawingModel to ANPDrawingModel

You need nsNPAPIPluginInstance::GetANPDrawingModel() since nsPluginInstanceOwner::Paint() currently using GetDrawingModel() to get the ANP drawing model. Fixed and tested patch attached.

Comment 3

[Bas Schouten (:bas.schouten)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e3ac624ee524

Comment 4

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

https://hg.mozilla.org/mozilla-central/rev/e3ac624ee524

Comment 5

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 589241 [details] [diff] [review]
Fixed up version of Bas' patch

[Triage Comment]
approval for beta to keep from having to rebase the rest of snorp's patches

Comment 6

[Brad Lassey [:blassey] (use needinfo?)]

https://hg.mozilla.org/releases/mozilla-beta/rev/10045c267ca1