diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-17 22:21:02 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-17 22:21:02 +0000 |
| commit | 8071f91036958af3c569f06b326f66982930226e (patch) | |
| tree | 84a937e9499e9b8696ceb02f3fc8884499db966a | |
| parent | e9ebf3fcc242c5686903956ae879cdf446325a24 (diff) | |
| download | chromium_src-8071f91036958af3c569f06b326f66982930226e.zip chromium_src-8071f91036958af3c569f06b326f66982930226e.tar.gz chromium_src-8071f91036958af3c569f06b326f66982930226e.tar.bz2 | |
Fix a couple more build errors, and make the V8 DerivedSources.make mirror the upstream one w.r.t. the HTMLEntityCodes changes I'm pulling down.
Review URL: http://codereview.chromium.org/7644
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3572 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/cpp_bound_class.cc | 2 | ||||
| -rw-r--r-- | webkit/port/DerivedSources.make | 9 |
3 files changed, 7 insertions, 6 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@3551", + "/trunk/deps/third_party/WebKit@3571", "src/third_party/cygwin": "/trunk/deps/third_party/cygwin@3248", diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index 3b5aed7..fa97eb6 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -27,7 +27,7 @@ MSVC_POP_WARNING() #if USE(JSC) #pragma warning(push, 0) -#include "JSLock.h" +#include <kjs/JSLock.h> #pragma warning(pop) #endif diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make index fd96f68..ea2e50f 100644 --- a/webkit/port/DerivedSources.make +++ b/webkit/port/DerivedSources.make @@ -623,8 +623,8 @@ all : \ CSSValueKeywords.h \ ColorData.c \ DocTypeStrings.cpp \ - HTMLEntityNames.c \ HTMLEntityCodes.c \ + HTMLEntityNames.c \ V8Attr.h \ V8BarInfo.h \ V8CDATASection.h \ @@ -963,12 +963,13 @@ DocTypeStrings.cpp : html/DocTypeStrings.gperf # HTML entity names -HTMLEntityNames.c : html/HTMLEntityNames.gperf - gperf -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 $< > $@ - +# This Google addition generates a reverse-mapping of entity codes back to entity names, for the DOM serialization code used by the Save page feature. HTMLEntityCodes.c : html/HTMLEntityNames.gperf perl $(WebCore)/../../../webkit/build/WebCore/generate_entitycodes.pl $< > $@ +HTMLEntityNames.c : html/HTMLEntityNames.gperf + gperf -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 $< > $@ + # color names ColorData.c : platform/ColorData.gperf |