Diff
Modified: trunk/Source/WebKit2/ChangeLog (159228 => 159229)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 21:26:33 UTC (rev 159229)
@@ -1,3 +1,17 @@
+2013-11-13 Nick Diego Yamane <[email protected]>
+
+ [GTK] Fix build after r159222
+ https://bugs.webkit.org/show_bug.cgi?id=124305
+
+ Reviewed by Tim Horton.
+
+ WebGraphicsContext and its API has been removed.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Shared/API/c/gtk/WKGraphicsContextGtk.cpp: Removed.
+ * Shared/API/c/gtk/WKGraphicsContextGtk.h: Removed.
+
2013-11-13 Tim Horton <[email protected]>
Remove redundant return after r159173
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (159228 => 159229)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-11-13 21:26:33 UTC (rev 159229)
@@ -1,6 +1,5 @@
webkit2_h_api += \
$(WebKit2)/Shared/API/c/gtk/WKBaseGtk.h \
- $(WebKit2)/Shared/API/c/gtk/WKGraphicsContextGtk.h \
$(WebKit2)/Shared/API/c/soup/WKBaseSoup.h \
$(WebKit2)/Shared/API/c/WKArray.h \
$(WebKit2)/Shared/API/c/WKBase.h \
@@ -15,7 +14,6 @@
$(WebKit2)/Shared/API/c/WKEvent.h \
$(WebKit2)/Shared/API/c/WKFindOptions.h \
$(WebKit2)/Shared/API/c/WKGeometry.h \
- $(WebKit2)/Shared/API/c/WKGraphicsContext.h \
$(WebKit2)/Shared/API/c/WKImage.h \
$(WebKit2)/Shared/API/c/WKMutableArray.h \
$(WebKit2)/Shared/API/c/WKMutableDictionary.h \
@@ -330,8 +328,6 @@
Source/WebKit2/Shared/API/c/cairo/WKImageCairo.cpp \
Source/WebKit2/Shared/API/c/cairo/WKImageCairo.h \
Source/WebKit2/Shared/API/c/gtk/WKBaseGtk.h \
- Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h \
- Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp \
Source/WebKit2/Shared/API/c/soup/WKBaseSoup.h \
Source/WebKit2/Shared/API/c/WKArray.cpp \
Source/WebKit2/Shared/API/c/WKArray.h \
@@ -355,8 +351,6 @@
Source/WebKit2/Shared/API/c/WKFindOptions.h \
Source/WebKit2/Shared/API/c/WKGeometry.h \
Source/WebKit2/Shared/API/c/WKGeometry.cpp \
- Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp \
- Source/WebKit2/Shared/API/c/WKGraphicsContext.h \
Source/WebKit2/Shared/API/c/WKImage.cpp \
Source/WebKit2/Shared/API/c/WKImage.h \
Source/WebKit2/Shared/API/c/WKMutableArray.cpp \
@@ -523,8 +517,6 @@
Source/WebKit2/Shared/WebGeolocationPosition.cpp \
Source/WebKit2/Shared/WebGeolocationPosition.h \
Source/WebKit2/Shared/WebGeometry.h \
- Source/WebKit2/Shared/WebGraphicsContext.cpp \
- Source/WebKit2/Shared/WebGraphicsContext.h \
Source/WebKit2/Shared/WebHitTestResult.cpp \
Source/WebKit2/Shared/WebHitTestResult.h \
Source/WebKit2/Shared/WebImage.cpp \
Deleted: trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp (159228 => 159229)
--- trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp 2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp 2013-11-13 21:26:33 UTC (rev 159229)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011 Igalia SL 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 "WKGraphicsContextGtk.h"
-
-#include "WKSharedAPICast.h"
-#include "WebGraphicsContext.h"
-
-using namespace WebKit;
-
-cairo_t* WKGraphicsContextGetGtkContext(WKGraphicsContextRef graphicsContextRef)
-{
- return toImpl(graphicsContextRef)->platformContext();
-}
Deleted: trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h (159228 => 159229)
--- trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h 2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h 2013-11-13 21:26:33 UTC (rev 159229)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2011 Igalia SL 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 WKGraphicsContextGtk_h
-#define WKGraphicsContextGtk_h
-
-#include <WebKit2/WKBase.h>
-
-#include <cairo.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT cairo_t* WKGraphicsContextGetGtkContext(WKGraphicsContextRef);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKGraphicsContextGtk_h */
