summaryrefslogtreecommitdiffstats
path: root/WebCore/page/android
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-09 16:57:47 +0100
committerSteve Block <steveblock@google.com>2009-10-20 00:45:07 +0100
commit72b26ecc49ccddf57e24b719c1f2a7fedae538c3 (patch)
tree130ccd9e72de019ba6014c117fd74fa3840102db /WebCore/page/android
parent10170b704c29772ec6c3fd4d7d19bdbae694dd4f (diff)
downloadexternal_webkit-72b26ecc49ccddf57e24b719c1f2a7fedae538c3.zip
external_webkit-72b26ecc49ccddf57e24b719c1f2a7fedae538c3.tar.gz
external_webkit-72b26ecc49ccddf57e24b719c1f2a7fedae538c3.tar.bz2
Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorControllerAndroid.
See http://trac.webkit.org/changeset/48167 Change-Id: I4488eeeb081e999acdfb70e5230f78fd5059ba19
Diffstat (limited to 'WebCore/page/android')
-rw-r--r--WebCore/page/android/InspectorControllerAndroid.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp
index 328a6f3..3c6a3a2 100644
--- a/WebCore/page/android/InspectorControllerAndroid.cpp
+++ b/WebCore/page/android/InspectorControllerAndroid.cpp
@@ -30,6 +30,7 @@
#include "InspectorClient.h"
#include "InspectorDOMAgent.h"
#include "InspectorFrontend.h"
+#include "InspectorTimelineAgent.h"
#include "Frame.h"
#include "Node.h"