Diff
Modified: trunk/Source/WebKit2/ChangeLog (95568 => 95569)
--- trunk/Source/WebKit2/ChangeLog 2011-09-20 21:01:12 UTC (rev 95568)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-20 21:14:33 UTC (rev 95569)
@@ -1,3 +1,16 @@
+2011-09-20 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r95565.
+ http://trac.webkit.org/changeset/95565
+ https://bugs.webkit.org/show_bug.cgi?id=68470
+
+ Broke builds (Requested by andersca on #webkit).
+
+ * GNUmakefile.am:
+ * Shared/API/c/WKHitTestResult.cpp: Removed.
+ * Shared/API/c/WKHitTestResult.h: Removed.
+ * UIProcess/API/C/WebKit2.h:
+
2011-09-20 Alexis Menard <[email protected]>
[Qt] [WK2] Implement a persistent cookie storage.
Modified: trunk/Source/WebKit2/GNUmakefile.am (95568 => 95569)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-20 21:01:12 UTC (rev 95568)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-20 21:14:33 UTC (rev 95569)
@@ -13,7 +13,6 @@
$(WebKit2)/Shared/API/c/WKFindOptions.h \
$(WebKit2)/Shared/API/c/WKGeometry.h \
$(WebKit2)/Shared/API/c/WKGraphicsContext.h \
- $(WebKit2)/Shared/API/c/WKHitTestResult.h \
$(WebKit2)/Shared/API/c/WKImage.h \
$(WebKit2)/Shared/API/c/WKMutableArray.h \
$(WebKit2)/Shared/API/c/WKMutableDictionary.h \
@@ -223,8 +222,6 @@
Source/WebKit2/Shared/API/c/WKGeometry.h \
Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp \
Source/WebKit2/Shared/API/c/WKGraphicsContext.h \
- Source/WebKit2/Shared/API/c/WKHitTestResult.cpp \
- Source/WebKit2/Shared/API/c/WKHitTestResult.h \
Source/WebKit2/Shared/API/c/WKImage.cpp \
Source/WebKit2/Shared/API/c/WKImage.h \
Source/WebKit2/Shared/API/c/WKMutableArray.cpp \
Deleted: trunk/Source/WebKit2/Shared/API/c/WKHitTestResult.cpp (95568 => 95569)
--- trunk/Source/WebKit2/Shared/API/c/WKHitTestResult.cpp 2011-09-20 21:01:12 UTC (rev 95568)
+++ trunk/Source/WebKit2/Shared/API/c/WKHitTestResult.cpp 2011-09-20 21:14:33 UTC (rev 95569)
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WKHitTestResult.h"
-
-#include "WKAPICast.h"
-#include "WebHitTestResult.h"
-
-using namespace WebKit;
-
-WKTypeID WKHitTestResultGetTypeID()
-{
- return toAPI(WebHitTestResult::APIType);
-}
-
-WKURLRef WKHitTestResultCopyAbsoluteImageURL(WKHitTestResultRef hitTestResultRef)
-{
- return toCopiedURLAPI(toImpl(hitTestResultRef)->absoluteImageURL());
-}
-
-WKURLRef WKHitTestResultCopyAbsoluteLinkURL(WKHitTestResultRef hitTestResultRef)
-{
- return toCopiedURLAPI(toImpl(hitTestResultRef)->absoluteLinkURL());
-}
-
-WKURLRef WKHitTestResultCopyAbsoluteMediaURL(WKHitTestResultRef hitTestResultRef)
-{
- return toCopiedURLAPI(toImpl(hitTestResultRef)->absoluteMediaURL());
-}
-
-WKStringRef WKHitTestResultCopyLinkLabel(WKHitTestResultRef hitTestResultRef)
-{
- return toCopiedAPI(toImpl(hitTestResultRef)->linkLabel());
-}
-
-WKStringRef WKHitTestResultCopyLinkTitle(WKHitTestResultRef hitTestResultRef)
-{
- return toCopiedAPI(toImpl(hitTestResultRef)->linkTitle());
-}
Deleted: trunk/Source/WebKit2/Shared/API/c/WKHitTestResult.h (95568 => 95569)
--- trunk/Source/WebKit2/Shared/API/c/WKHitTestResult.h 2011-09-20 21:01:12 UTC (rev 95568)
+++ trunk/Source/WebKit2/Shared/API/c/WKHitTestResult.h 2011-09-20 21:14:33 UTC (rev 95569)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKHitTestResult_h
-#define WKHitTestResult_h
-
-#include <WebKit2/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKHitTestResultGetTypeID();
-
-WK_EXPORT WKURLRef WKHitTestResultCopyAbsoluteImageURL(WKHitTestResultRef hitTestResult);
-WK_EXPORT WKURLRef WKHitTestResultCopyAbsoluteLinkURL(WKHitTestResultRef hitTestResult);
-WK_EXPORT WKURLRef WKHitTestResultCopyAbsoluteMediaURL(WKHitTestResultRef hitTestResult);
-
-WK_EXPORT WKStringRef WKHitTestResultCopyLinkLabel(WKHitTestResultRef hitTestResult);
-WK_EXPORT WKStringRef WKHitTestResultCopyLinkTitle(WKHitTestResultRef hitTestResult);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKHitTestResult_h */
Modified: trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h (95568 => 95569)
--- trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h 2011-09-20 21:01:12 UTC (rev 95568)
+++ trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h 2011-09-20 21:14:33 UTC (rev 95569)
@@ -43,7 +43,6 @@
#include <WebKit2/WKGeolocationPermissionRequest.h>
#include <WebKit2/WKGeolocationPosition.h>
#include <WebKit2/WKGraphicsContext.h>
-#include <WebKit2/WKHitTestResult.h>
#include <WebKit2/WKMutableArray.h>
#include <WebKit2/WKMutableDictionary.h>
#include <WebKit2/WKNavigationData.h>
Modified: trunk/Tools/ChangeLog (95568 => 95569)
--- trunk/Tools/ChangeLog 2011-09-20 21:01:12 UTC (rev 95568)
+++ trunk/Tools/ChangeLog 2011-09-20 21:14:33 UTC (rev 95569)
@@ -1,3 +1,14 @@
+2011-09-20 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r95565.
+ http://trac.webkit.org/changeset/95565
+ https://bugs.webkit.org/show_bug.cgi?id=68470
+
+ Broke builds (Requested by andersca on #webkit).
+
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (mouseDidMoveOverElement):
+
2011-09-20 Nayan Kumar K <[email protected]>
Get hover'ed element URL from HitTest.
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (95568 => 95569)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-09-20 21:01:12 UTC (rev 95568)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-09-20 21:14:33 UTC (rev 95569)
@@ -592,16 +592,18 @@
return returnValue;
}
-static void mouseDidMoveOverElement(WKPageRef page, WKHitTestResultRef hitTestResult, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo)
+static void mouseDidMoveOverElement(WKPageRef page, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo)
{
BrowserWindow *window = BROWSER_WINDOW(clientInfo);
gtk_statusbar_pop(GTK_STATUSBAR(window->statusBar), window->statusBarContextId);
- WKURLRef linkUrlRef = WKHitTestResultCopyAbsoluteLinkURL(hitTestResult);
- if (!linkUrlRef)
+ if (!userData)
return;
- gchar *link = WKURLGetCString(linkUrlRef);
+ if (WKGetTypeID(userData) != WKURLGetTypeID())
+ return;
+
+ gchar *link = WKURLGetCString((WKURLRef)userData);
gtk_statusbar_push(GTK_STATUSBAR(window->statusBar), window->statusBarContextId, link);
g_free(link);
}
