| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove urlmon.lib from activex_shim's AdditionalDependencies.
Add urlmon.lib to AdditionalDependencies in chrome_dll.vcproj
and unittests.vcproj.
Add activex_shim as a dependency of default_plugin, so the things
that link against default_plugin get urlmon.lib from the
activex_shim link_settings.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/126103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18366 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18360 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove unnecessary addition of urlmon.lib to AdditionalDepenedencies
of activex_shim.
Add activex_shim as a dependency of default_plugin (so the things
that link against it get urlmon.lib from the link_settings of
activex_shim).
Add urlmon.lib to AdditionalDependencies in unittests.vcproj
(which is going away soon, but this makes the
transition smooth).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/126073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18359 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18355 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
of activex_shim. Add it as a dependency of default_plugin.
Add urlmon.lib to AdditionalDependencies in unittests.vcproj
(going away soon, but this makes the transition smooth).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18354 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
targets, to avoid -l[Uu]rlmon.lib duplication in link lines.
BUG=none
TEST=successful build
Review URL: http://codereview.chromium.org/119316
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17892 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/115192
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15771 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* build\all.gyp now uses webkit\webkit.gyp and
webkit\tools\test_shell\test_shell.gyp.
* 'svn remove' checked-in .sln and .vcproj files that will now
become gyp-generated files. (We'll leave the other old ones
in place, uncalled, and remove them with a later CL.)
* Add generated *.sln and *.vcproj files to svn:ignore on
the relevant directories.
* Update various chrome\**.vcproj files with the new gyp directory
in which various generated webkit files will now appear.
* Update the checked-in chrome\chrome.sln with all (?) the changes
necessary to reflect the new gyp generation.
Review URL: http://codereview.chromium.org/115115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15618 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
default plugin. NPP_URLNotify
is always called after the stream has already been destroyed by the browser. This can lead to crashes especially
when the plugin instance is being torn down, which in turn closes open streams.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=11308
Bug=11308
Review URL: http://codereview.chromium.org/113054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15476 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
| |
http://crbug.com/11387
Review URL: http://codereview.chromium.org/109043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15352 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/99182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14837 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/99173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14832 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Review URL: http://codereview.chromium.org/72004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13610 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
tests and the test_shell_tests on linux.
PLEASE back yourself out when you see you can't fix
a bug instead of leaving it red for days.
Review URL: http://codereview.chromium.org/67074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13575 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Review URL: http://codereview.chromium.org/63151
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13555 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
Too many loose ends.
Review URL: http://codereview.chromium.org/66020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13485 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/63152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13480 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
parameterize the 'type' setting of the various library targets, with a
default of 'static_library'.
(Hat tip to Craig Schlenter.)
Review URL: http://codereview.chromium.org/62127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13345 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/53121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
first updated chrome webkit after 1.0 shipped.
Basically in the 1.0 branch when the plugin was instantiated in its instantiation it would get the mime type along with the list of other arguments. If an object tag was specified with the classid, it would get mapped to the mime type. With the webkit merge the classs id is passed in along with the mime type.
The plugin installer thinks that this is an activex installation on receiving a valid class id and
and ends up checking if it is a white listed classid, etc.
All this code will be taken out along with the activex shim in the near future. For now we take this code path only if we don't have a valid mime type.
This fixes http://code.google.com/p/chromium/issues/detail?id=8584
Added a plugin test for the argument parsing functionality in the default plugin. I changed the ParseInstantiationArguments function in the
plugin installer to a static function to be able to unit test this.
Bug=8584
Review URL: http://codereview.chromium.org/42684
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12733 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
download, even though we point the user to the main download Java page which contains a released version of the Java plugin. I only update plugins2.xml, since plugins.xml looks deprecated.
BUG=7550
TEST=Uninstall Java plugin, if installed. Open a page that uses Java (ie. http://www.java.com/en/download/help/testvm.xml) and make sure the message says "download Java" not "download Java something something (Beta)".
Review URL: http://codereview.chromium.org/48080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11911 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/48019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11766 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/42155
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11593 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/43148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11590 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
Normalize end of file newlines in webkit/. All files end in a single newline.
Review URL: http://codereview.chromium.org/42070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11443 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/42044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11388 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
Got app and unit_tests linking with gyp under windows.
Still missing pieces (things don't run).
Review URL: http://codereview.chromium.org/39319
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11302 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
| |
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
(doesn't run correctly yet).
Switched all uses of windows system libraries that assumed they were in the include path to use -l (which will be
supported on windows in a separate change).
Review URL: http://codereview.chromium.org/27362
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10781 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
the headers too.
Review URL: http://codereview.chromium.org/21472
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10167 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
build, add another missed file (plugin_impl_mac.h) to unbreak the
Mac build.
Review URL: http://codereview.chromium.org/21245
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9561 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
windows-specific and have plugin_impl.h include the
correct version based on the platform.
jam: primary
evan: FYI
Review URL: http://codereview.chromium.org/19727
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8997 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
classes may not be safe to use until Init() has been called. As an
example, RenderThread() creates it's IPC::SyncChannel in Init(), so it
isn't safe to call Send() method until after.
Update use of a Thread (hit with ui_tests) to no longer require Init()
be called after the startup event is signaled (required old thread
behavior).
Ran a bunch more tests on Windows to try harder to make sure I didn't break anything.
Review URL: http://codereview.chromium.org/18824
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8695 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
webkit_resources.vcproj which creates the .rc files and have webkit
glue depend on it.
I had to add a flag to grit that allows a resource to be in the
header, but not in the .rc file. We do this for a test_shell only
resource that is not compiled in.
SCons build also works on windows.
I still need to update the other .sln files and mac build.
Review URL: http://codereview.chromium.org/17466
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7910 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
from the other webkit resources. I'm going to convert
webkit_resources.rc to a cross platform .grd file so I'm moving
the windows specific default plugin code into a separate file.
Review URL: http://codereview.chromium.org/17306
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7812 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Moved the grit .vsprops file from chrome/tools/build/win/ to
/tools/grit/build and renamed to using_generated_resources.vsprops.
Updated non-chrome projects to use the this new vsprops file.
Created a new .rules file and renamed the old one. Now there are
grit_resources.rules and grit_localized_resources.rules. The latter
is what we use now, but I'll be adding some grd files that use the
former in a follow up change.
This is just vsprops reshuffling for now. I'll also add a
using_generated_resources.scons in a follow up change.
Review URL: http://codereview.chromium.org/14901
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7560 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
updated ICU dep that uses it as well.
Add a SHARED scons command-line flag to build shared libraries.
Review URL: http://codereview.chromium.org/16477
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7479 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(project files still to come). To wit:
* Solution file configuration is in *_sln.scons files (base\base_sln.scons,
chrome\chrome_sln.scons).
* Individual Project file configuration is in the the .scons file for
the relevant target (base\base_unittests.scons,
third_party\libxml\libxml.scons, etc.)--that is, where their file
lists will live.
* MSVSProject() calls are currently placeholders that establish
the existence of Project Nodes (and Project dependencies) but don't yet
have actual Project configuration information (file lists, .vsprops, etc.).
* Configuraiton is very manual. In particular, the entries in the .sln
file will be written out in exactly the order specified in the
configuration(s). The current ordering is taken from our existing
.sln files, so we can generate virtually the same configurations
on output.
* Generated solution files are nearly byte-for-byte identical
with our existing .sln files, modulo:
* net\dump_cache has a WebsiteProperties sections (making that
configurable per project isn't important right now);
* sandbox\sandbox.sln was missing a dependency of base.vcproj on
on debug_message.vcproj (present in other .sln files)
* webkit\webkit.sln was missing dependencies of WebCore.vcproj on
libxml_config.vcproj and libxslt_config.vcproj (present in
chrome.sln);
* add a handful of other miscellaneous missing dependencies on various
.vcproj definitions in chrome.sln (present in other .sln files).
* remove stats_viewer.csproj from chrome.sln (sorry, mbelshe),
which was complicating the solution configuration with unnecessary
(for us) "Mixed Platform" types;
* All MSVSFolder(), MSVSProject() and MSVSSolution() calls have
hard-wired guid= values taken from our existing configuration,
so we can: 1) verify generation of working configs; 2) minimize
diffs when checking in generated .sln files. We can remove
these in the future in favor of extracting them from existing
.sln files if we wish.
* Add ChromeMSVSFolder(), ChromeMSVSProject() and ChromeMSVSSolution()
wrappers to chromium_builders.py, that gate the underlying call to
the env.MSVS*() builders based on whether env.Bit('msvs') is set
(i.e., we're in --mode=msvs).
* Remove platform-specific gating of to-be-ported .scons files that we
now need to load on any platform to generate coheren MSVS files.
Move the env.Bit('windows') tests for actually building their
executables into the individual .scons files.
Review URL: http://codereview.chromium.org/14472
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7297 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
and better-thought-out Hammer env.Bits() idioms:
* env['PLATFORM'] == 'win32' => env.Bit('windows')
* env['PLATFORM'] == 'posix' => env.Bit('linux')
* env['PLATFORM'] == 'darwin' => env.Bit('mac')
New idioms:
* env.Bit('posix') => really does mean "any POSIX platform"
* env.AnyBits('mac', 'linux') => specifically mac or linux, excluding
other POSIX platforms
Where we were using compound conditionals (e.g., "env['PLATFORM'] in
('posix', 'darwin')") I tried to take my best shot at translating
the intent (i.e., "env.Bits('posix')" for something POSIX, "not
env.Bits('mac')" for something not yet ported to Mac, etc.)
Review URL: http://codereview.chromium.org/15051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
| |
Patch fails otherwise on non-Windows platforms.
Review URL: http://codereview.chromium.org/14478
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7093 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Joi has convinced me that GRIT should generate platform specific
resources files. This is easier than parsing .rc files because
GRIT effectively has an .rc parser. To that end, we need to
convert some existing .rc files to .grd files (e.g., net_resources.rc
and webkit_resources.rc). Rather than having every grd file output
to a different place and -I all the different paths, have GRIT
generate all files into one directory. This directory is
grit_derived_sources.
Review URL: http://codereview.chromium.org/13776
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6940 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/13133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6372 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
flag for displaying UI. The latest flash player installer needs this. Launching this exe without this flag causes the exe to just wait around doing nothing.
As part of this CB we also pass in the current directory in SHELLEXECUTEINFO. This is set to the directory where the plugin installer is downloaded.
This fixes http://code.google.com/p/chromium/issues/detail?id=4346.
Bug=4346
R=nsylvain
Review URL: http://codereview.chromium.org/10650
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5306 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
java plugin installer from Sun.
The chrome_plugins_file.xml has been renamed to plugins2.xml. The older
version of the file (plugins.xml) is also being checked in. This is
needed to support the Chrome version in the field.
R=mal
Review URL: http://codereview.chromium.org/9085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4613 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
is to allow users to download the java plugin via our plugin installer.
The plugin installer currently supports URLs which point to executable files.
However the java runtime path is timed and changes frequently. As a stop gap
fix for this, I added a facility in the plugin installer which indicates if
a URL is a display URL. If yes then we navigate to this URL in a new tab,
and allow the user to download the plugin from there.
The format of the chrome_plugins_file.xml has been changed to have each plugin
node specify a list of mime types. This reduces a great deal of duplicated
information in the plugins file.
Changed the plugin finder URL to http://dl.google.com/chrome/plugins/plugins2.xml
to ensure that older clients continue to work.
Bug=3769
R=jam
Review URL: http://codereview.chromium.org/8729
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4260 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
to update the java plugin installer URLs to the official release from Sun.
Bug=3769
TBR=mal
Review URL: http://codereview.chromium.org/8634
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4030 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/7995
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4022 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
This will facilitate changing where the main sconstruct lives.
Review URL: http://codereview.chromium.org/7847
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3725 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/7530
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3637 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/7656
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3597 0039d316-1c4b-4281-b951-d872f2087c98
|