summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoralph <alph@chromium.org>2015-03-20 11:15:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-20 18:15:28 +0000
commit8dbee05273d671da16f2bf5d605642479c8cb637 (patch)
treee1853b2433fd4668b945f7773d94a4c649919b43 /content
parentbc1ee8a26a899b13bd19ca2c6e486d37610fc380 (diff)
downloadchromium_src-8dbee05273d671da16f2bf5d605642479c8cb637.zip
chromium_src-8dbee05273d671da16f2bf5d605642479c8cb637.tar.gz
chromium_src-8dbee05273d671da16f2bf5d605642479c8cb637.tar.bz2
Fix compilation on non-x86 arch after r321565
TBR=yurys,smckay,gunsch NOTRY=true Review URL: https://codereview.chromium.org/1025753003 Cr-Commit-Position: refs/heads/master@{#321601}
Diffstat (limited to 'content')
-rw-r--r--content/renderer/devtools/v8_sampling_profiler.cc4
-rw-r--r--content/renderer/devtools/v8_sampling_profiler_browsertest.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/devtools/v8_sampling_profiler.cc b/content/renderer/devtools/v8_sampling_profiler.cc
index b79e030..34469e5 100644
--- a/content/renderer/devtools/v8_sampling_profiler.cc
+++ b/content/renderer/devtools/v8_sampling_profiler.cc
@@ -445,8 +445,8 @@ void V8SamplingThread::HandleProfilerSignal(int signal,
mcontext_t& mcontext = ucontext->uc_mcontext;
v8::RegisterState state;
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
- // TODO(alph): Add support for Android and ChromeOS
+#if defined(OS_ANDROID) || !defined(ARCH_CPU_X86_FAMILY)
+ // TODO(alph): Add support for Android and non-x86.
ALLOW_UNUSED_LOCAL(mcontext);
#elif defined(OS_MACOSX)
diff --git a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
index 7d7d5ea..958c796 100644
--- a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
+++ b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
@@ -118,11 +118,11 @@ class V8SamplingProfilerTest : public RenderViewTest {
TraceResultBuffer::SimpleOutput json_output_;
};
-// TODO(alph): Implement on Windows, Android and ChromeOS.
+// TODO(alph): Implement on Windows, Android and non-x86.
// The SamplingEventForTesting is fired when the framework collected at
// least one JitCodeAdded event and one sample event.
-#if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_ANDROID) || !defined(ARCH_CPU_X86_FAMILY)
#define MAYBE(x) DISABLED_##x
#else
#define MAYBE(x) x