chromium_src.git - central chromium sources

	Commit message (Collapse)	Author	Age	Files	Lines
*	Help with VS2008 compilation.	maruel@google.com	2008-11-18	1	-0/+4
\| \| \| \| \| \|	Review URL: http://codereview.chromium.org/11233 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5622 0039d316-1c4b-4281-b951-d872f2087c98
*	Update DerivedSources.make to match modified WebKit scripts. This allows us ↵	pkasting@chromium.org	2008-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \|	to unfork HTMLAttributeNames.in, since the upstream patch I pulled into our third_party directory supersedes the change we made locally. This also reverts my earlier change to the include order in webkit_common.vsprops, which should now no longer be necessary. Review URL: http://codereview.chromium.org/7116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3306 0039d316-1c4b-4281-b951-d872f2087c98
*	This change seems dumb, but it works.	pkasting@chromium.org	2008-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently, WebCore/html and the DerivedSources both include an HTMLElementFactory.h -- each of which prototype the same functions, but with different signatures >:(. The reason this doesn't seem to be a problem upstream is that their include paths pull in WebCore/html before they pull in the DerivedSources. In our case, these include paths come from two separate .vsprops. The .vsprops seem to be considered last-first, so if we include foo.vsprops and bar.vsprops, the resulting merged include path is "bar/;foo/". So I just swap the .vsprops that contains DerivedSources with the one that contains WebCore/html. There may be a better fix. From the actual list of headers in the upstream projects, it's not clear HTMLElementFactory.h is even still supposed to _be_ autogenerated. If it isn't, and it just hasn't been noticed due to this include path issue, then perhaps we should do a local+upstream patch to stop it from being generated at all. However, I haven't yet been able to figure out why this file gets generated :(. Comments welcome. Review URL: http://codereview.chromium.org/7045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3167 0039d316-1c4b-4281-b951-d872f2087c98
*	Merge the chrome_webkit_merge_branch back on to trunk. This brings us	tc@google.com	2008-10-01	1	-1/+1
\| \| \| \| \| \| \|	up to webkit@36102. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
*	Add webkit to the repository.	initial.commit	2008-07-27	1	-0/+8
	git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18 0039d316-1c4b-4281-b951-d872f2087c98