diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-15 14:04:10 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:36:01 -0800 |
| commit | aa6878d56425aa4e290f55a7f4b6a02c36f5cd6b (patch) | |
| tree | 237ae242e2bdf595e1848c8712a670a40d126537 /WebCore/inspector/InspectorResourceAgent.cpp | |
| parent | d0dada9ef392026973da2fbb2cb4d9b9504f91f0 (diff) | |
| download | external_webkit-aa6878d56425aa4e290f55a7f4b6a02c36f5cd6b.zip external_webkit-aa6878d56425aa4e290f55a7f4b6a02c36f5cd6b.tar.gz external_webkit-aa6878d56425aa4e290f55a7f4b6a02c36f5cd6b.tar.bz2 | |
Merge Webkit at r71558: Resolve conflit with INSPECTOR
This is a cherry pick from one latest webkit fix.
http://trac.webkit.org/changeset/71981
Change-Id: I46d45af50654d836c7bfcf4c7d2d58a827cd366b
Diffstat (limited to 'WebCore/inspector/InspectorResourceAgent.cpp')
| -rw-r--r-- | WebCore/inspector/InspectorResourceAgent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/inspector/InspectorResourceAgent.cpp b/WebCore/inspector/InspectorResourceAgent.cpp index 0ed6cba..fcdebbc 100644 --- a/WebCore/inspector/InspectorResourceAgent.cpp +++ b/WebCore/inspector/InspectorResourceAgent.cpp @@ -31,6 +31,8 @@ #include "config.h" #include "InspectorResourceAgent.h" +#if ENABLE(INSPECTOR) + #include "Base64.h" #include "MemoryCache.h" #include "CachedResource.h" @@ -60,8 +62,6 @@ #include <wtf/RefPtr.h> #include <wtf/text/StringBuffer.h> -#if ENABLE(INSPECTOR) - namespace WebCore { bool InspectorResourceAgent::resourceContent(Frame* frame, const KURL& url, String* result) |