Title: [138982] trunk/Source/WebKit2
- Revision
- 138982
- Author
- [email protected]
- Date
- 2013-01-07 13:34:23 -0800 (Mon, 07 Jan 2013)
Log Message
[WK2] Remove more obsolete shim code
https://bugs.webkit.org/show_bug.cgi?id=106248
Reviewed by Anders Carlsson.
Removing KeychainItemShimCallbacks, and SecItemRequestData::CopyContent, which was
only needed for that obsolete version of shim.
We now use WebProcessSecItemShimCallbacks.
* Shared/mac/SecItemRequestData.h:
* UIProcess/mac/WebProcessProxyMac.mm:
(WebKit::handleSecItemRequest):
* WebProcess/mac/WebProcessShim.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138981 => 138982)
--- trunk/Source/WebKit2/ChangeLog 2013-01-07 21:26:01 UTC (rev 138981)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-07 21:34:23 UTC (rev 138982)
@@ -1,3 +1,20 @@
+2013-01-07 Alexey Proskuryakov <[email protected]>
+
+ [WK2] Remove more obsolete shim code
+ https://bugs.webkit.org/show_bug.cgi?id=106248
+
+ Reviewed by Anders Carlsson.
+
+ Removing KeychainItemShimCallbacks, and SecItemRequestData::CopyContent, which was
+ only needed for that obsolete version of shim.
+
+ We now use WebProcessSecItemShimCallbacks.
+
+ * Shared/mac/SecItemRequestData.h:
+ * UIProcess/mac/WebProcessProxyMac.mm:
+ (WebKit::handleSecItemRequest):
+ * WebProcess/mac/WebProcessShim.h:
+
2013-01-05 Sam Weinig <[email protected]>
Merge child process main functions as much as possible
Modified: trunk/Source/WebKit2/Shared/mac/SecItemRequestData.h (138981 => 138982)
--- trunk/Source/WebKit2/Shared/mac/SecItemRequestData.h 2013-01-07 21:26:01 UTC (rev 138981)
+++ trunk/Source/WebKit2/Shared/mac/SecItemRequestData.h 2013-01-07 21:34:23 UTC (rev 138982)
@@ -43,7 +43,6 @@
Add,
Update,
Delete,
- CopyContent,
};
SecItemRequestData();
Modified: trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm (138981 => 138982)
--- trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2013-01-07 21:26:01 UTC (rev 138981)
+++ trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2013-01-07 21:34:23 UTC (rev 138982)
@@ -39,6 +39,10 @@
SecItemResponseData response;
switch (request.type()) {
+ case SecItemRequestData::Invalid:
+ ASSERT_NOT_REACHED();
+ return;
+
case SecItemRequestData::CopyMatching: {
CFTypeRef resultObject = 0;
OSStatus resultCode = SecItemCopyMatching(request.query(), &resultObject);
@@ -64,9 +68,6 @@
response = SecItemResponseData(resultCode, 0);
break;
}
-
- default:
- return;
}
connection->send(Messages::WebProcess::SecItemResponse(requestID, response), 0);
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessShim.h (138981 => 138982)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessShim.h 2013-01-07 21:26:01 UTC (rev 138981)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessShim.h 2013-01-07 21:34:23 UTC (rev 138982)
@@ -36,16 +36,6 @@
typedef void (*WebProcessSecItemShimInitializeFunc)(const WebProcessSecItemShimCallbacks& callbacks);
-struct WebProcessKeychainItemShimCallbacks {
- OSStatus (*secKeychainItemCopyContent)(SecKeychainItemRef, SecItemClass*, SecKeychainAttributeList*, UInt32* length, void** outData);
- OSStatus (*secKeychainItemCreateFromContent)(SecItemClass, SecKeychainAttributeList*, UInt32 length, const void* data, SecKeychainItemRef*);
- OSStatus (*secKeychainItemModifyContent)(SecKeychainItemRef, const SecKeychainAttributeList*, UInt32 length, const void* data);
- bool (*freeAttributeListContent)(SecKeychainAttributeList* attrList);
- bool (*freeKeychainItemContentData)(void* data);
-};
-
-typedef void (*WebProcessKeychainItemShimInitializeFunc)(const WebProcessKeychainItemShimCallbacks& callbacks);
-
} // namespace WebKit
#endif // WebProcessShim_h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
