Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(711)

Issue 72004: Relanding the following revisions.... (Closed)

Created:
11 years, 8 months ago by ananta
Modified:
9 years, 6 months ago
Reviewers:
Nicolas Sylvain
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Relanding the following revisions. r13555 Log: Remove the Activex shim registration for generic Activex controls. The Activex shim only handles windows media player in the wild and will continue to do so for the forseeable future. This fixes http://code.google.com/p/chromium/issues/detail?id=8584, which is basically related to our NPAPI plugin installer not getting instantiated on pages which instantiated flash using an object tag, which would result in webkit attempting to instantiate the activex shim. The shim only loads the windows media player classid, thus causing this issue. Added a test shell test which tests whether the default plugin loaded correctly. This is done by attempting to instantiate a special mime type application/chromium-test-default-plugin, which serves as an indicator to the default plugin to call a function in the page indicating that the test succeeded. I also made a change to ensure that the default plugin is loaded in test_shell_tests. Removed the activexshim dll project from chrome.sln Bug=8584 New Revision: 13558 Log: Removing the Activex shim plugin from the list of default plugins caused some activex shim tests to fail. This basically fails for pages which instantiate the media player like an activex only. To handle this case we attempt to map the clsid to a NPAPI mime type if possible in the shim. If we succeed then the shim is instantiated as an NPAPI plugin as before. It internally loads the media player activex. The other changes are to ensure that the default plugin is only enabled in test_shell for windows for now. Bug=8584 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=13610

Patch Set 1 #

Patch Set 2 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2082 lines, -2019 lines) Patch
M chrome/chrome.sln View 1 36 chunks +1978 lines, -1993 lines 0 comments Download
M chrome/test/plugin/plugin_test.cpp View 1 1 chunk +1 line, -1 line 0 comments Download
M webkit/activex_shim/activex_shared.h View 1 1 chunk +4 lines, -0 lines 0 comments Download
M webkit/activex_shim/activex_shared.cc View 1 1 chunk +13 lines, -0 lines 0 comments Download
M webkit/default_plugin/plugin_main.cc View 1 3 chunks +32 lines, -0 lines 0 comments Download
M webkit/glue/plugins/plugin_list_win.cc View 1 1 chunk +0 lines, -14 lines 0 comments Download
M webkit/glue/webframeloaderclient_impl.cc View 1 1 chunk +15 lines, -10 lines 0 comments Download
M webkit/tools/test_shell/plugin_tests.cc View 1 1 chunk +28 lines, -0 lines 0 comments Download
M webkit/tools/test_shell/test_shell.cc View 1 2 chunks +11 lines, -1 line 0 comments Download

Messages

Total messages: 2 (0 generated)
ananta
11 years, 8 months ago (2009-04-13 05:49:15 UTC) #1
Nicolas Sylvain
11 years, 8 months ago (2009-04-13 17:50:24 UTC) #2
LGTM

Powered by Google App Engine
This is Rietveld 408576698