Bug 33673 - [Android] bindings/v8/ScriptController.cpp needs to conditionally include ChromiumBridge.h or PlatformBridge.h, depending on the platform (Chromium or Android)
Summary: [Android] bindings/v8/ScriptController.cpp needs to conditionally include Chr...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Android Android
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on: 33917
Blocks:
  Show dependency treegraph
 
Reported: 2010-01-14 07:33 PST by Andrei Popescu
Modified: 2010-01-21 21:06 PST (History)
2 users (show)

See Also:


Attachments
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp (2.57 KB, patch)
2010-01-14 07:39 PST, Andrei Popescu
no flags Details | Formatted Diff | Diff
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp (2.58 KB, patch)
2010-01-14 07:43 PST, Andrei Popescu
levin: review-
Details | Formatted Diff | Diff
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp (2.46 KB, patch)
2010-01-20 13:22 PST, Andrei Popescu
no flags Details | Formatted Diff | Diff
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp (2.45 KB, patch)
2010-01-20 14:03 PST, Andrei Popescu
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andrei Popescu 2010-01-14 07:33:02 PST
bindings/v8/ScriptController.cpp needs to conditionally include ChromiumBridge.h or PlatformBridge.h, depending on the platform (Chromium or Android)

Android's PlatformBridge class also needs the static NPObject* pluginScriptableObject(Widget*); method, which provides the NPObject associated with a PluginView.
Comment 1 Andrei Popescu 2010-01-14 07:39:59 PST
Created attachment 46565 [details]
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp
Comment 2 Andrei Popescu 2010-01-14 07:43:34 PST
Created attachment 46566 [details]
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp

Had a tab in the Changelog in the previous patch.
Comment 3 David Levin 2010-01-20 08:08:17 PST
Comment on attachment 46566 [details]
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp

Please remove ifdef's as discussed.
Comment 4 Andrei Popescu 2010-01-20 12:58:49 PST
I filed a separate bug (33917) about adding the "PlatformBridge.h" header. Will upload a new patch here as well.
Comment 5 Andrei Popescu 2010-01-20 13:22:37 PST
Created attachment 47057 [details]
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp
Comment 6 Andrei Popescu 2010-01-20 14:03:12 PST
Created attachment 47062 [details]
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp

Forgot to update the Changelog to reflect the changes in the latest patch.
Comment 7 WebKit Commit Bot 2010-01-21 21:06:46 PST
Comment on attachment 47062 [details]
Add PlatformBridge::pluginScriptableObject and include PlatformBridge.h from ScriptController.cpp

Clearing flags on attachment: 47062

Committed r53673: <http://trac.webkit.org/changeset/53673>
Comment 8 WebKit Commit Bot 2010-01-21 21:06:51 PST
All reviewed patches have been landed.  Closing bug.