Changeset 95315 in webkit
- Timestamp:
- Sep 16, 2011 1:12:07 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r95314 r95315 1 2011-09-16 Anders Carlsson <andersca@apple.com> 2 3 Add back the WKHitTestResultRef parameter to mouseDidMoveOverElement in an ABI preserving way 4 https://bugs.webkit.org/show_bug.cgi?id=68269 5 6 Reviewed by Geoffrey Garen. 7 8 Add back WKPageMouseDidMoveOverElementCallback last and deprecate the current callback. 9 10 * UIProcess/API/C/WKPage.h: 11 * UIProcess/WebUIClient.cpp: 12 (WebKit::WebUIClient::mouseDidMoveOverElement): 13 1 14 2011-09-16 Alexey Proskuryakov <ap@apple.com> 2 15 -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.h
r95311 r95315 169 169 typedef void (*WKPageUnfocusCallback)(WKPageRef page, const void *clientInfo); 170 170 typedef void (*WKPageSetStatusTextCallback)(WKPageRef page, WKStringRef text, const void *clientInfo); 171 typedef void (*WKPageMouseDidMoveOverElementCallback)(WKPageRef page, WK EventModifiers modifiers, WKTypeRef userData, const void *clientInfo);171 typedef void (*WKPageMouseDidMoveOverElementCallback)(WKPageRef page, WKHitTestResultRef hitTestResult, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo); 172 172 typedef void (*WKPageMissingPluginButtonClickedCallback)(WKPageRef page, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo); 173 173 typedef void (*WKPageDidNotHandleKeyEventCallback)(WKPageRef page, WKNativeEventPtr event, const void *clientInfo); … … 198 198 // Deprecated 199 199 typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo); 200 200 typedef void (*WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0)(WKPageRef page, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo); 201 201 202 struct WKPageUIClient { 202 203 int version; … … 214 215 WKPageRunJavaScriptPromptCallback runJavaScriptPrompt; 215 216 WKPageSetStatusTextCallback setStatusText; 216 WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;217 WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0; 217 218 WKPageMissingPluginButtonClickedCallback missingPluginButtonClicked; 218 219 WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent; … … 246 247 // Version 1 247 248 WKPageCreateNewPageCallback createNewPage; 249 WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 248 250 }; 249 251 typedef struct WKPageUIClient WKPageUIClient; -
trunk/Source/WebKit2/UIProcess/WebUIClient.cpp
r95311 r95315 158 158 void WebUIClient::mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResult::Data& data, WebEvent::Modifiers modifiers, APIObject* userData) 159 159 { 160 if (!m_client.mouseDidMoveOverElement) 161 return; 162 163 // FIXME: Pass the hit test result to the UI client callback function. 160 if (!m_client.mouseDidMoveOverElement && !m_client.mouseDidMoveOverElement_deprecatedForUseWithV0) 161 return; 162 163 if (m_client.version == kWKPageUIClientCurrentVersion && !m_client.mouseDidMoveOverElement) 164 return; 165 166 if (!m_client.version) { 167 m_client.mouseDidMoveOverElement_deprecatedForUseWithV0(toAPI(page), toAPI(modifiers), toAPI(userData), m_client.clientInfo); 168 return; 169 } 170 164 171 RefPtr<WebHitTestResult> webHitTestResult = WebHitTestResult::create(data); 165 m_client.mouseDidMoveOverElement(toAPI(page), toAPI( modifiers), toAPI(userData), m_client.clientInfo);172 m_client.mouseDidMoveOverElement(toAPI(page), toAPI(webHitTestResult.get()), toAPI(modifiers), toAPI(userData), m_client.clientInfo); 166 173 } 167 174 -
trunk/Tools/ChangeLog
r95311 r95315 1 2011-09-16 Anders Carlsson <andersca@apple.com> 2 3 Add back the WKHitTestResultRef parameter to mouseDidMoveOverElement in an ABI preserving way 4 https://bugs.webkit.org/show_bug.cgi?id=68269 5 6 Reviewed by Geoffrey Garen. 7 8 Update client function signatures. 9 10 * MiniBrowser/gtk/BrowserWindow.c: 11 (browserWindowUIClientInit): 12 * MiniBrowser/mac/BrowserWindowController.m: 13 (mouseDidMoveOverElement): 14 (-[BrowserWindowController awakeFromNib]): 15 * MiniBrowser/win/BrowserView.cpp: 16 (BrowserView::create): 17 * WebKitTestRunner/TestController.cpp: 18 (WTR::TestController::createOtherPage): 19 (WTR::TestController::initialize): 20 1 21 2011-09-16 Anders Carlsson <andersca@apple.com> 2 22 -
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
r93902 r95315 624 624 runJavaScriptPrompt, 625 625 0, /* setStatusText */ 626 mouseDidMoveOverElement,626 0, /* mouseDidMoveOverElement_deprecatedForUseWithV0 */ 627 627 0, /* missingPluginButtonClicked */ 628 628 0, /* didNotHandleKeyEvent */ … … 653 653 0, /* saveDataToFileInDownloadsFolder */ 654 654 0, /* shouldInterruptJavaScript */ 655 createNewPage 655 createNewPage, 656 mouseDidMoveOverElement 656 657 }; 657 658 WKPageSetPageUIClient(WKViewGetPage(window->webView), &uiClient); -
trunk/Tools/MiniBrowser/mac/BrowserWindowController.m
r95311 r95315 491 491 } 492 492 493 static void mouseDidMoveOverElement(WKPageRef page, WK EventModifiers modifiers, WKTypeRef userData, const void *clientInfo)493 static void mouseDidMoveOverElement(WKPageRef page, WKHitTestResultRef hitTestResult, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo) 494 494 { 495 495 LOG(@"mouseDidMoveOverElement"); … … 627 627 runJavaScriptPrompt, 628 628 setStatusText, 629 mouseDidMoveOverElement,629 0, /* mouseDidMoveOverElement_deprecatedForUseWithV0 */ 630 630 0, /* missingPluginButtonClicked */ 631 631 0, /* didNotHandleKeyEvent */ … … 657 657 0, // shouldInterruptJavaScript 658 658 createNewPage, 659 mouseDidMoveOverElement, 659 660 }; 660 661 WKPageSetPageUIClient(_webView.pageRef, &uiClient); -
trunk/Tools/MiniBrowser/win/BrowserView.cpp
r95305 r95315 106 106 runJavaScriptPrompt, 107 107 setStatusText, 108 mouseDidMoveOverElement,108 0, /* mouseDidMoveOverElement_deprecatedForUseWithV0 */ 109 109 0, /* missingPluginButtonClicked */ 110 110 0, /* didNotHandleKeyEvent */ … … 136 136 0, /* shouldInterruptJavaScript */ 137 137 createNewPage, 138 mouseDidMoveOverElement, 138 139 }; 139 140 -
trunk/Tools/WebKitTestRunner/TestController.cpp
r95039 r95315 158 158 0, // runJavaScriptPrompt 159 159 0, // setStatusText 160 0, // mouseDidMoveOverElement 160 0, // mouseDidMoveOverElement_deprecatedForUseWithV0 161 161 0, // missingPluginButtonClicked 162 162 0, // didNotHandleKeyEvent … … 188 188 0, // shouldInterruptJavaScript 189 189 createOtherPage, 190 0, // mouseDidMoveOverElement 190 191 }; 191 192 WKPageSetPageUIClient(newPage, &otherPageUIClient); … … 302 303 0, // runJavaScriptPrompt 303 304 0, // setStatusText 304 0, // mouseDidMoveOverElement 305 0, // mouseDidMoveOverElement_deprecatedForUseWithV0 305 306 0, // missingPluginButtonClicked 306 307 0, // didNotHandleKeyEvent … … 332 333 0, // shouldInterruptJavaScript 333 334 createOtherPage, 335 0, // mouseDidMoveOverElement 334 336 }; 335 337 WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
Note: See TracChangeset
for help on using the changeset viewer.