summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.sln
Commit message (Collapse)AuthorAgeFilesLines
* Relanding the following revisions.ananta@chromium.org2009-04-131-1993/+1978
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Revert change 13558 and 13555 because they broke the pluginnsylvain@chromium.org2009-04-131-1978/+1993
| | | | | | | | | | | 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
* Remove the Activex shim registration for generic Activex controls. The ↵ananta@chromium.org2009-04-111-1993/+1978
| | | | | | | | | | | | | | | | | | | | | | | | 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
* Rolling back change 13480 (change to gyp for webkit on windows).bradnelson@google.com2009-04-101-1899/+2012
| | | | | | | | 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
* Fixing missing dependency in chrome.slnbradnelson@google.com2009-04-101-0/+1
| | | | | | Review URL: http://codereview.chromium.org/68005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13484 0039d316-1c4b-4281-b951-d872f2087c98
* Switching webkit to gyp on windows.bradnelson@google.com2009-04-091-2012/+1899
| | | | | | Review URL: http://codereview.chromium.org/63152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13480 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing v8 settings to fix startup_tests regression.bradnelson@google.com2009-04-071-1983/+1983
| | | | | | Review URL: http://codereview.chromium.org/62121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13304 0039d316-1c4b-4281-b951-d872f2087c98
* Switching breakpad to gyp generated project.bradnelson@google.com2009-04-071-2/+2
| | | | | | Review URL: http://codereview.chromium.org/62076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13223 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back change 13146.bradnelson@google.com2009-04-061-1/+1
| | | | | | | | (Shouldn't muck with where other platforms put their output. Review URL: http://codereview.chromium.org/63008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13149 0039d316-1c4b-4281-b951-d872f2087c98
* Changing v8_shell to v8_shell_sample to match what the buildbot expects.bradnelson@google.com2009-04-061-1/+1
| | | | | | Review URL: http://codereview.chromium.org/63006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13146 0039d316-1c4b-4281-b951-d872f2087c98
* Switching to gyp generated v8 on windows.bradnelson@google.com2009-04-061-380/+66
| | | | | | Review URL: http://codereview.chromium.org/63004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13145 0039d316-1c4b-4281-b951-d872f2087c98
* Switching windows over to gyp generated googleurl.bradnelson@google.com2009-04-051-1/+1
| | | | | | Review URL: http://codereview.chromium.org/62045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13138 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Move IPC code to ipc/"agl@chromium.org2009-04-031-16/+8
| | | | | | | This reverts commit r13062 which, unsurprisingly, broke the build. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13063 0039d316-1c4b-4281-b951-d872f2087c98
* Move IPC code to ipc/agl@chromium.org2009-04-031-8/+16
| | | | | | | (No review URL: Rietvelt couldn't cope) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13062 0039d316-1c4b-4281-b951-d872f2087c98
* Add a ui test that can be used to fetch a url and wait for a cookie to be set. asargent@chromium.org2009-04-021-0/+44
| | | | | | | | | It can also save a cookie value and javascript value out to a file. Review URL: http://codereview.chromium.org/57021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13032 0039d316-1c4b-4281-b951-d872f2087c98
* Move a bunch of libs over to gyp on windows.bradnelson@google.com2009-04-021-2/+2
| | | | | | Review URL: http://codereview.chromium.org/60019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13020 0039d316-1c4b-4281-b951-d872f2087c98
* Reland changes to enable worker layout tests. Compared to last review ↵jianli@chromium.org2009-03-301-0/+33
| | | | | | | | | | | (http://codereview.chromium.org/50045), the following changes are made: 1) Add chrome/test/worker/DEPS to address checkdeps error. 2) Change test_expectations.txt to skip some worker layout tests. 3) Add test_worker.vcproj to webkit.sln so that test_worker.dll can be built for WebKit build. Review URL: http://codereview.chromium.org/56074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12822 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 12763.jianli@chromium.org2009-03-301-33/+0
| | | | | | Review URL: http://codereview.chromium.org/56055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12764 0039d316-1c4b-4281-b951-d872f2087c98
* Enable worker layout tests. In order for test_shell to run worker, we link ↵jianli@chromium.org2009-03-301-0/+33
| | | | | | | | all of the code required to run the worker into a DLL and then load that DLL in test_shell. This allows us to host a separate V8 instance. Review URL: http://codereview.chromium.org/50045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12763 0039d316-1c4b-4281-b951-d872f2087c98
* Switching media to gyp under windows.bradnelson@google.com2009-03-301-2/+2
| | | | | | Review URL: http://codereview.chromium.org/57002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12761 0039d316-1c4b-4281-b951-d872f2087c98
* It looks like the Chrome NPAPI plugin installer has been broken since we ↵ananta@chromium.org2009-03-281-0/+327
| | | | | | | | | | | | | | | | | | | | | | | 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
* Switching sandbox to gyp on windows.bradnelson@google.com2009-03-231-1/+1
| | | | | | | | | Rolling forward deps on gyp to get 'copies' support. This time handled wow_helper. Review URL: http://codereview.chromium.org/42355 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12270 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 11946 since it is causing a build breakage on full rebuild. The maruel@chromium.org2009-03-181-1/+1
| | | | | | | | | | sandbox project wasn't copying wow_helper.exe anymore, causing a build breakage on x64 platforms only. TBR=bnelson Review URL: http://codereview.chromium.org/42328 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11955 0039d316-1c4b-4281-b951-d872f2087c98
* Moving sbox to gyp on windows.bradnelson@google.com2009-03-181-1/+1
| | | | | | | | | (Also fixing missing property on sdch.) Review URL: http://codereview.chromium.org/42317 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11946 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing subtle dependency on client name on my last change to chrome.sln.bradnelson@google.com2009-03-181-1/+1
| | | | | | Review URL: http://codereview.chromium.org/48119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11944 0039d316-1c4b-4281-b951-d872f2087c98
* Switching net over to use gyp on windows.bradnelson@google.com2009-03-181-1294/+1318
| | | | | | Review URL: http://codereview.chromium.org/48108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11942 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting change 11688.bradnelson@google.com2009-03-141-1306/+1294
| | | | | | | | TBR. Review URL: http://codereview.chromium.org/46070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11692 0039d316-1c4b-4281-b951-d872f2087c98
* Switching net to gyp on windows.bradnelson@google.com2009-03-131-1294/+1306
| | | | | | Review URL: http://codereview.chromium.org/42184 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11688 0039d316-1c4b-4281-b951-d872f2087c98
* Cleaning up Website junk in sln files.bradnelson@google.com2009-03-121-704/+0
| | | | | | Review URL: http://codereview.chromium.org/42143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11573 0039d316-1c4b-4281-b951-d872f2087c98
* Pointing slns at generated vcprojs from base.bradnelson@google.com2009-03-121-1291/+2002
| | | | | | Review URL: http://codereview.chromium.org/42047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11520 0039d316-1c4b-4281-b951-d872f2087c98
* Checking in media::FFmpegGlue, media::FFmpegDemuxer and tests.scherkus@chromium.org2009-03-101-0/+3
| | | | | | | | | | | | | | Fixes build break by including FFmpeg dependency for media project in chrome.sln. This is a second attempt at committing the following changelists: http://codereview.chromium.org/39295 http://codereview.chromium.org/28165 TBR=darin Review URL: http://codereview.chromium.org/42029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11356 0039d316-1c4b-4281-b951-d872f2087c98
* Add performance tests for the proxy resolver implementations.ericroman@google.com2009-03-061-0/+5
| | | | | | | | | I downloaded the test data "no-ads.pac" from <http://ap.coova.org/wpad.dat>. BUG=2764 Review URL: http://codereview.chromium.org/40149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11066 0039d316-1c4b-4281-b951-d872f2087c98
* Initial checkin of the out of process worker implementation.jam@chromium.org2009-03-041-0/+16
| | | | | | | | | | | WebWorkerClient/WebWorker are parallel interfaces of WebCore::{WorkerObjectProxy, WorkerContextProxy} that use Chrome data types. When WebKit requests a WorkerObjectProxy, we create an instance of WebWorkerClientImpl. This class creates an object that implements a Chromium version of WorkerObjectProxy (i.e. with Chrome data types) through WebViewDelegate. That object is a WebWorkerProxy and talks over IPC to a WebWorker object in the worker process. The WebWorker object creates the actual WebCore::Worker object using another class in glue: WebWorkerImpl. When the WebCore::Worker object running in the worker process wants to talk back to the code running in the renderer, it talks to WebWorkerImpl which implements WebCore::WorkerObjectProxy. WebWorkerImpl converts the data types to Chrome compatible ones, and then calls the WebWorkerClient version which does IPC to get to the renderer process. This ends up at WebWorkerProxy, which calls WebWorkerClientImpl (the original class). In future changes, sandboxing, multiple worker processes etc will be added. Note that I also had to make two small changes to WebKit, since WorkerMessagingProxy couldn't be created as is for the nested worker case. I'll either check it in myself or work with Jian to do so. Review URL: http://codereview.chromium.org/27157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10847 0039d316-1c4b-4281-b951-d872f2087c98
* Add v8 as dep in chrome.sln for ui_tests.ericroman@google.com2009-03-031-0/+2
| | | | | | | TBR=nsylvain@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10836 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium changes to use new WebKit, WebKitClient, and WebClipboard interfaces.darin@chromium.org2009-02-261-1/+3
| | | | | | | | | | | | | | | | | | | A new WebKitClientImpl class is added to webkit/glue that consumers can use to help implement WebKitClient. In the future, consumers will likely subclass WebKitClientImpl. For now, that is not necessary. Since a WebImage may not hold a SkBitmap, I needed to modify ScopedClipboardWriterGlue to not deal in SkBitmaps. So, I just added a WriteBitmapFromPixels method in place of the WriteBitmap method. That method is actually named the same as the one from the base class, which is perhaps kind of nice since the purpose of ScopedClipboardWriterGlue is to override the default way of sending an image to the clipboard! R=dglazkov Review URL: http://codereview.chromium.org/28119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10416 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 10251.ericroman@google.com2009-02-251-0/+2
| | | | | | | | | | | This re-lands the dependency on v8 by net (http://codereview.chromium.org/28049) It was rolled back before because of failure compiling on submodule buildbot. Marc-Antoine has updated those builders to checkout v8, so this should work now. Review URL: http://codereview.chromium.org/27160 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10409 0039d316-1c4b-4281-b951-d872f2087c98
* Added FFmpeg project to chrome, chrome_kjs and media solution files.scherkus@chromium.org2009-02-251-0/+11
| | | | | | Review URL: http://codereview.chromium.org/28011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10319 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 10250.ericroman@google.com2009-02-241-2/+0
| | | | | | | Rolling back since the windows module builders are failing ot find v8 project... Review URL: http://codereview.chromium.org/27081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10251 0039d316-1c4b-4281-b951-d872f2087c98
* Add v8 as dependency of net.ericroman@google.com2009-02-241-0/+2
| | | | | | | | | | | This is needed for ProxyResolverV8, which executes proxy auto config scripts. See bug 2764. This CL has changes for {xcode, visualstudio}, but not {scons} yet. Review URL: http://codereview.chromium.org/28049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10250 0039d316-1c4b-4281-b951-d872f2087c98
* Add new vcproj for contents of third_party/WebKit/WebKit/chromiumdarin@chromium.org2009-02-231-0/+20
| | | | | | | | R=maruel Review URL: http://codereview.chromium.org/27040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10184 0039d316-1c4b-4281-b951-d872f2087c98
* Removing sections that look like they were accidentally addedfinnur@google.com2009-02-211-688/+0
| | | | | | | | and are causing slowdown in startup. Review URL: http://codereview.chromium.org/28009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10149 0039d316-1c4b-4281-b951-d872f2087c98
* Make perftests, generate_profile, interactive_ui_tests and unit_tests depend ↵maruel@chromium.org2009-02-201-0/+4
| | | | | | | | on printing. Review URL: http://codereview.chromium.org/27001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10107 0039d316-1c4b-4281-b951-d872f2087c98
* Add printing in chrome/DEPS.maruel@chromium.org2009-02-201-0/+1
| | | | | | | Fix printing_unittests dependencies to include gtest. Review URL: http://codereview.chromium.org/20540 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10106 0039d316-1c4b-4281-b951-d872f2087c98
* Move units to new module printing. Add printing_unittests on Windows too. ↵maruel@chromium.org2009-02-201-0/+36
| | | | | | | | Make test_shell and chrome_dll dependent on printing. Review URL: http://codereview.chromium.org/21475 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10105 0039d316-1c4b-4281-b951-d872f2087c98
* Make browser depend on webkit_resources. Fixes windowstc@google.com2009-02-131-0/+1
| | | | | | | | | | build on buildbot. TBR=deanm Review URL: http://codereview.chromium.org/21361 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9793 0039d316-1c4b-4281-b951-d872f2087c98
* Port remaining .rc data resource files to grd. This includestc@google.com2009-02-131-0/+3
| | | | | | | | debugger_resources.rc, common_resources.rc, and renderer_resources.rc. Review URL: http://codereview.chromium.org/21307 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9784 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the executable bit from a bunch of files that shouldn't have had it.evan@chromium.org2009-02-121-0/+0
| | | | | | | R=tony (looked over my shoulder before I committed) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9683 0039d316-1c4b-4281-b951-d872f2087c98
* Second try of landing chrome_resources project. Changes from last time:tc@google.com2009-02-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | - fix scons dependencies by adding a target for grit/theme_resources.h - fix mac build by adding grit to unittest include path - fix check deps by adding rules for /grit dir. Create a chrome_resources.vcproj that holds grd files that hold non-string resources. Put browser_resources.grd into this vcproj. Port theme_resources.rc/theme_resources.h to theme_resources.grd and put it in the vcproj too. I did a find/replace on the theme_resources include line. Modify grit so header files go in grit_generated_resources/grit/ so the include path can be cleaner. I'll migrate the others in follow up patches. theme_resources.rc had a conditional include of distribution_resources.rc so I had to add support for preprocessor defines to visual studio. Review URL: http://codereview.chromium.org/24011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9664 0039d316-1c4b-4281-b951-d872f2087c98
* This is an attempt at finding the reason for the page_cycler slowness caused bymad@chromium.org2009-02-121-0/+1
| | | | | | | | | | | | | | | the new resize corner. Local experiment led me to believe that it is WebKit that is slower when we specify a resize corner area. To validate this hypothesis, I always return an empty rect to WebKit, but I still compute and push the rect to the render widget and I also draw the bitmap even if this will cause it to be drawn on top of the scroll bars when there is only one. TBR=brettw git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9654 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Create a chrome_resources.vcproj that holds grd files that hold"tc@google.com2009-02-121-10/+2
| | | | | | | | | | This reverts commit r9631. TBR=deanm Review URL: http://codereview.chromium.org/23023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9634 0039d316-1c4b-4281-b951-d872f2087c98