From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 14:57:50 +0000 Subject: Merge webkit.org at r54127 : Initial merge by git Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 --- WebKit/win/Interfaces/IWebHTMLRepresentation.idl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'WebKit/win/Interfaces/IWebHTMLRepresentation.idl') diff --git a/WebKit/win/Interfaces/IWebHTMLRepresentation.idl b/WebKit/win/Interfaces/IWebHTMLRepresentation.idl index 7fbd451..ff39c0a 100644 --- a/WebKit/win/Interfaces/IWebHTMLRepresentation.idl +++ b/WebKit/win/Interfaces/IWebHTMLRepresentation.idl @@ -95,11 +95,17 @@ interface IWebHTMLRepresentation : IUnknown /* - (NSString *)searchForLabels:(NSArray *)labels beforeElement:(DOMElement *)element; + Deprecated: use the variant that includes resultDistance and resultIsInCellAbove instead. */ - HRESULT searchForLabels([in, size_is(cLabels)] BSTR* labels, [in] int cLabels, [in] IDOMElement* beforeElement, [out, retval] BSTR* result); + HRESULT deprecatedSearchForLabels([in, size_is(cLabels)] BSTR* labels, [in] int cLabels, [in] IDOMElement* beforeElement, [out, retval] BSTR* result); /* - (NSString *)matchLabels:(NSArray *)labels againstElement:(DOMElement *)element; */ HRESULT matchLabels([in, size_is(cLabels)] BSTR* labels, [in] int cLabels, [in] IDOMElement* againstElement, [out, retval] BSTR* result); + + /* + - (NSString *)searchForLabels:(NSArray *)labels beforeElement:(DOMElement *)element resultDistance:(NSUInteger*)outDistance resultIsInCellAbove:(BOOL*)outIsInCellAbove; + */ + HRESULT searchForLabels([in, size_is(cLabels)] BSTR* labels, [in] unsigned cLabels, [in] IDOMElement* beforeElement, [out] unsigned* resultDistance, [out] BOOL* resultIsInCellAbove, [out, retval] BSTR* result); } -- cgit v1.1