diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 18:49:07 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 18:49:07 +0000 |
| commit | 699ffb85a67ee640e266f8348622f22aa5d8a908 (patch) | |
| tree | 880de092d1555aa93138b407960e20e58b7fdac4 | |
| parent | 491c9820c4aa31b3e4c99f9136564925117f7598 (diff) | |
| download | chromium_src-699ffb85a67ee640e266f8348622f22aa5d8a908.zip chromium_src-699ffb85a67ee640e266f8348622f22aa5d8a908.tar.gz chromium_src-699ffb85a67ee640e266f8348622f22aa5d8a908.tar.bz2 | |
Add ifdef to make upstreaming of v8_utility.h easiler.
Review URL: http://codereview.chromium.org/118101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17416 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/port/bindings/v8/v8_utility.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/webkit/port/bindings/v8/v8_utility.h b/webkit/port/bindings/v8/v8_utility.h index 620c04c..a7c3325 100644 --- a/webkit/port/bindings/v8/v8_utility.h +++ b/webkit/port/bindings/v8/v8_utility.h @@ -5,6 +5,15 @@ #ifndef V8_UTILITY_H__ #define V8_UTILITY_H__ +#include "V8Utilities.h" + +// To break a cycle dependency during upstreaming this block of code, +// ifdefing it out based on this #define. +// +// TODO(ajwong): After https://bugs.webkit.org/show_bug.cgi?id=25595 +// lands and is rolled down into chromium, migrate all headaers to use +// the code in V8Utilities.h directly, and then, remove this code. +#ifndef V8UTILITIES_DEFINED namespace WebCore { class AllowAllocation { @@ -54,5 +63,6 @@ v8::Local<v8::Object> SafeAllocation::NewInstance( } } // namespace WebCore +#endif // V8UTILITIES_DEFINED #endif // V8_UTILITY_H__ |