Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebCore / inspector / InspectorPageAgent.h

diff --git a/Source/WebCore/inspector/InspectorPageAgent.h b/Source/WebCore/inspector/InspectorPageAgent.h
index bb6b96f..233a953 100644 (file)
--- a/Source/WebCore/inspector/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/InspectorPageAgent.h
@@ -31,7 +31,7 @@
 #ifndef InspectorPageAgent_h
 #define InspectorPageAgent_h
 
-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
 
 #include "PlatformString.h"
 #include <wtf/RefCounted.h>
@@ -58,7 +58,7 @@ public:
     // Page API for InspectorFrontend
     void addScriptToEvaluateOnLoad(ErrorString*, const String& source);
     void removeAllScriptsToEvaluateOnLoad(ErrorString*);
-    void reloadPage(ErrorString*, bool ignoreCache);
+    void reloadPage(ErrorString*, const bool* const optionalIgnoreCache);
     void openInInspectedWindow(ErrorString*, const String& url);
     void setUserAgentOverride(ErrorString*, const String& userAgent);
     void getCookies(ErrorString*, RefPtr<InspectorArray>* cookies, WTF::String* cookiesString);
@@ -90,6 +90,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
+#endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorPageAgent_h)
+#endif // !defined(InspectorPagerAgent_h)