diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-05 13:18:43 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-10-05 16:45:11 +0100 |
| commit | 13cb86d508a2af29cda7a8336a3375ccddab1bd0 (patch) | |
| tree | de7af0fb33ee3d5f3d9ff45d6e7f27aac6ed2dda | |
| parent | 79b343f3ddbd41da7ec351af7747dae1143c4c52 (diff) | |
| download | external_webkit-13cb86d508a2af29cda7a8336a3375ccddab1bd0.zip external_webkit-13cb86d508a2af29cda7a8336a3375ccddab1bd0.tar.gz external_webkit-13cb86d508a2af29cda7a8336a3375ccddab1bd0.tar.bz2 | |
Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h
This is a cherry-pick of the following upstream CL:
https://bugs.webkit.org/show_bug.cgi?id=47179
This violates the rules at the top of the file, and means that it
will be included before any other includes for all compilation
units.
We are now just including JavaScriptCore/config.h from
WebCore/config.h so if you include one you get both.
This created a compile error in V8Counters.cpp, which is also fixed
Change-Id: I272247161877ddc680b3aab509bc413ab3445219
| -rw-r--r-- | WebCore/WebCorePrefix.h | 5 | ||||
| -rw-r--r-- | WebCore/config.h | 6 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/V8Counters.cpp | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h index cde5a85..a871e4c 100644 --- a/WebCore/WebCorePrefix.h +++ b/WebCore/WebCorePrefix.h @@ -70,11 +70,6 @@ #define PREFIX_FOR_WEBCORE 1 #define EXPORT __attribute__((visibility("default"))) #endif -// Android uses a single set of include directories when building WebKit and -// JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android -// includes JavaScriptCore/config.h explicitly here to make sure it gets picked -// up. -#include <JavaScriptCore/config.h> #endif #if !defined(BUILDING_BREWMP__) diff --git a/WebCore/config.h b/WebCore/config.h index f88ad3b..b259f9e 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -81,6 +81,12 @@ // ANDROID def should be after all PLATFORM to avoid override. #if PLATFORM(ANDROID) +// Android uses a single set of include directories when building WebKit and +// JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android +// includes JavaScriptCore/config.h explicitly here to make sure it gets picked +// up. +#include <JavaScriptCore/config.h> + #define WEBCORE_NAVIGATOR_VENDOR "Google Inc." // This must be defined before we include FastMalloc.h, below. #define USE_SYSTEM_MALLOC 1 diff --git a/WebKit/android/WebCoreSupport/V8Counters.cpp b/WebKit/android/WebCoreSupport/V8Counters.cpp index 4e7351d..d164f9a 100644 --- a/WebKit/android/WebCoreSupport/V8Counters.cpp +++ b/WebKit/android/WebCoreSupport/V8Counters.cpp @@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if USE(V8) #ifdef ANDROID_INSTRUMENT @@ -31,12 +30,14 @@ #include "config.h" #include "V8Counters.h" -#include "NotImplemented.h" +#include "NotImplemented.h" #include <utils/Log.h> #include <wtf/text/CString.h> #include <wtf/text/StringHash.h> +#if USE(V8) + namespace WebCore { V8Counters::Counter::Counter(bool isHistogram) |