Bring webcore_test up-to-date.

startLoadingResource changed its signature. Some reference stuff changed and
SecurityOrigin got the local load policy stuff. Change the makefile to link
against the shared lib instead of the static lib.

4 files changed, 12 insertions, 11 deletions

diff --git a/perf/Android.mk b/perf/Android.mk
index 80ed7df..a3a5050 100644
--- a/perf/Android.mk
+++ b/perf/Android.mk
@@ -33,10 +33,11 @@ LOCAL_SRC_FILES := \
 	main.cpp
 
 # Pull the webkit definitions from the base webkit makefile.
-LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
+#LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := libwebcore $(WEBKIT_SHARED_LIBRARIES)
 LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
-LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)
+LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) \
+	external/webkit
 LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
 
 LOCAL_MODULE := webcore_test
diff --git a/perf/Intercept.cpp b/perf/Intercept.cpp
index 9c4517e..c31fe5e 100644
--- a/perf/Intercept.cpp
+++ b/perf/Intercept.cpp
@@ -153,7 +153,7 @@ void MyResourceLoader::loadFile(const String& file) {
 }
 
 WebCoreResourceLoader* MyWebFrame::startLoadingResource(ResourceHandle* handle,
-        const ResourceRequest& req, bool ignore1, bool ignore2) {
+        const ResourceRequest& req, bool ignore) {
     MyResourceLoader* loader = new MyResourceLoader(handle, req.url().string());
     Retain(loader);
     m_requests.append(loader);
diff --git a/perf/Intercept.h b/perf/Intercept.h
index 3945582..a5e50c7 100644
--- a/perf/Intercept.h
+++ b/perf/Intercept.h
@@ -67,7 +67,7 @@ public:
         , m_timer(this, &MyWebFrame::timerFired) {}
 
     virtual WebCoreResourceLoader* startLoadingResource(ResourceHandle* handle,
-            const ResourceRequest& req, bool, bool);
+            const ResourceRequest& req, bool);
 
     virtual bool canHandleRequest(const ResourceRequest&) { return true; }
 
diff --git a/perf/main.cpp b/perf/main.cpp
index e3cb5b3..37ed8a7 100644
--- a/perf/main.cpp
+++ b/perf/main.cpp
@@ -49,6 +49,7 @@
 #include "PlatformGraphicsContext.h"
 #include "ResourceRequest.h"
 #include "ScriptController.h"
+#include "SecurityOrigin.h"
 #include "SelectionController.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
@@ -78,7 +79,7 @@ public:
     virtual void signalServiceFuncPtrQueue() {}
 
     // Cookie methods that do nothing.
-    virtual void setCookies(const KURL&, const KURL&, const String&) {}
+    virtual void setCookies(const KURL&, const String&) {}
     virtual String cookies(const KURL&) { return ""; }
     virtual bool cookiesEnabled() { return false; }
 
@@ -120,7 +121,7 @@ int main(int argc, char** argv) {
     ScriptController::initializeThreading();
 
     // Setting this allows data: urls to load from a local file.
-    FrameLoader::setLocalLoadPolicy(FrameLoader::AllowLocalLoadsForAll);
+    SecurityOrigin::setLocalLoadPolicy(SecurityOrigin::AllowLocalLoadsForAll);
 
     // Create the fake JNIEnv and JavaVM
     InitializeJavaVM();
@@ -137,7 +138,7 @@ int main(int argc, char** argv) {
     ChromeClientAndroid* chrome = new ChromeClientAndroid;
     EditorClientAndroid* editor = new EditorClientAndroid;
     Page* page = new Page(chrome, new ContextMenuClientAndroid, editor,
-            new DragClientAndroid, new InspectorClientAndroid);
+            new DragClientAndroid, new InspectorClientAndroid, NULL);
     editor->setPage(page);
 
     // Create MyWebFrame that intercepts network requests
@@ -157,8 +158,8 @@ int main(int argc, char** argv) {
     // draw later without risk of it being deleted.
     WebViewCore* webViewCore = new WebViewCore(JSC::Bindings::getJNIEnv(),
             MY_JOBJECT, frame.get());
-    FrameView* frameView = new FrameView(frame.get());
-    WebFrameView* webFrameView = new WebFrameView(frameView, webViewCore);
+    RefPtr<FrameView> frameView = FrameView::create(frame.get());
+    WebFrameView* webFrameView = new WebFrameView(frameView.get(), webViewCore);
     frame->setView(frameView);
     frameView->resize(width, height);
     Release(webViewCore);
@@ -226,7 +227,6 @@ int main(int argc, char** argv) {
     delete enc;
 
     // Tear down the world.
-    frameView->deref();
     frame->loader()->detachFromParent();
     delete page;