1 files changed, 18 insertions, 59 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/WKFrame.cpp b/Source/WebKit2/UIProcess/API/C/WKFrame.cpp
index 3bb375f7d..f54e70d8a 100644
--- a/Source/WebKit2/UIProcess/API/C/WKFrame.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKFrame.cpp
@@ -26,12 +26,12 @@
 #include "config.h"
 #include "WKFrame.h"
 
+#include "APIData.h"
+#include "APIFrameInfo.h"
 #include "WKAPICast.h"
+#include "WebCertificateInfo.h"
 #include "WebFrameProxy.h"
-
-#ifdef __BLOCKS__
-#include <Block.h>
-#endif
+#include "WebPageProxy.h"
 
 using namespace WebKit;
 
@@ -48,13 +48,13 @@ bool WKFrameIsMainFrame(WKFrameRef frameRef)
 WKFrameLoadState WKFrameGetFrameLoadState(WKFrameRef frameRef)
 {
     WebFrameProxy* frame = toImpl(frameRef);
-    switch (frame->loadState()) {
-        case WebFrameProxy::LoadStateProvisional:
-            return kWKFrameLoadStateProvisional;
-        case WebFrameProxy::LoadStateCommitted:
-            return kWKFrameLoadStateCommitted;
-        case WebFrameProxy::LoadStateFinished:
-            return kWKFrameLoadStateFinished;
+    switch (frame->frameLoadState().state()) {
+    case FrameLoadState::State::Provisional:
+        return kWKFrameLoadStateProvisional;
+    case FrameLoadState::State::Committed:
+        return kWKFrameLoadStateCommitted;
+    case FrameLoadState::State::Finished:
+        return kWKFrameLoadStateFinished;
     }
     
     ASSERT_NOT_REACHED();
@@ -126,63 +126,22 @@ bool WKFrameIsFrameSet(WKFrameRef frameRef)
     return toImpl(frameRef)->isFrameSet();
 }
 
-void WKFrameGetMainResourceData(WKFrameRef frameRef, WKFrameGetResourceDataFunction callback, void* context)
+WKFrameInfoRef WKFrameCreateFrameInfo(WKFrameRef frameRef)
 {
-    toImpl(frameRef)->getMainResourceData(DataCallback::create(context, callback));
+    return toAPI(&API::FrameInfo::create(*toImpl(frameRef), WebCore::SecurityOrigin::createFromString(toImpl(frameRef)->url())).leakRef());
 }
 
-void WKFrameGetResourceData(WKFrameRef frameRef, WKURLRef resourceURL, WKFrameGetResourceDataFunction callback, void* context)
-{
-    toImpl(frameRef)->getResourceData(toImpl(resourceURL), DataCallback::create(context, callback));
-}
-
-#ifdef __BLOCKS__
-static void callGetResourceDataBlockAndDispose(WKDataRef data, WKErrorRef error, void* context)
-{
-    WKFrameGetResourceDataBlock block = (WKFrameGetResourceDataBlock)context;
-    block(data, error);
-    Block_release(block);
-}
-
-void WKFrameGetMainResourceData_b(WKFrameRef frameRef, WKFrameGetResourceDataBlock block)
+void WKFrameGetMainResourceData(WKFrameRef frameRef, WKFrameGetResourceDataFunction callback, void* context)
 {
-    WKFrameGetMainResourceData(frameRef, callGetResourceDataBlockAndDispose, Block_copy(block));
+    toImpl(frameRef)->getMainResourceData(toGenericCallbackFunction(context, callback));
 }
 
-void WKFrameGetResourceData_b(WKFrameRef frameRef, WKURLRef resourceURL, WKFrameGetResourceDataBlock block)
+void WKFrameGetResourceData(WKFrameRef frameRef, WKURLRef resourceURL, WKFrameGetResourceDataFunction callback, void* context)
 {
-    WKFrameGetResourceData(frameRef, resourceURL, callGetResourceDataBlockAndDispose, Block_copy(block));
+    toImpl(frameRef)->getResourceData(toImpl(resourceURL), toGenericCallbackFunction(context, callback));
 }
-#endif
 
 void WKFrameGetWebArchive(WKFrameRef frameRef, WKFrameGetWebArchiveFunction callback, void* context)
 {
-    toImpl(frameRef)->getWebArchive(DataCallback::create(context, callback));
-}
-
-#ifdef __BLOCKS__
-static void callGetWebArchiveBlockAndDispose(WKDataRef archiveData, WKErrorRef error, void* context)
-{
-    WKFrameGetWebArchiveBlock block = (WKFrameGetWebArchiveBlock)context;
-    block(archiveData, error);
-    Block_release(block);
-}
-
-void WKFrameGetWebArchive_b(WKFrameRef frameRef, WKFrameGetWebArchiveBlock block)
-{
-    WKFrameGetWebArchive(frameRef, callGetWebArchiveBlockAndDispose, Block_copy(block));
-}
-#endif
-
-
-// NOTE: These are deprecated and should be removed. They currently do nothing.
-
-WKArrayRef WKFrameCopyChildFrames(WKFrameRef)
-{
-    return 0;
-}
-
-WKFrameRef WKFrameGetParentFrame(WKFrameRef)
-{
-    return 0;
+    toImpl(frameRef)->getWebArchive(toGenericCallbackFunction(context, callback));
 }