Diff
Modified: trunk/Source/WebCore/ChangeLog (191447 => 191448)
--- trunk/Source/WebCore/ChangeLog 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/ChangeLog 2015-10-22 08:56:01 UTC (rev 191448)
@@ -1,3 +1,25 @@
+2015-10-22 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK+ build after r191423.
+
+ Deprecate removed class WebKitDOMHTMLBaseFontElement.
+
+ * PlatformGTK.cmake:
+ * bindings/gobject/WebKitDOMDeprecated.cpp:
+ (webkit_dom_html_base_font_element_init):
+ (webkit_dom_html_base_font_element_class_init):
+ (webkit_dom_html_base_font_element_get_color):
+ (webkit_dom_html_base_font_element_set_color):
+ (webkit_dom_html_base_font_element_get_face):
+ (webkit_dom_html_base_font_element_set_face):
+ (webkit_dom_html_base_font_element_get_size):
+ (webkit_dom_html_base_font_element_set_size):
+ * bindings/gobject/WebKitDOMDeprecated.h:
+ * bindings/gobject/WebKitDOMDeprecated.symbols:
+ * bindings/gobject/WebKitDOMHTMLPrivate.cpp:
+ * html/HTMLBaseFontElement.h:
+ * html/HTMLBaseFontElement.idl:
+
2015-10-22 Xabier Rodriguez Calvar <calva...@igalia.com>
[Streams API] Add writable stream attributes
Modified: trunk/Source/WebCore/PlatformGTK.cmake (191447 => 191448)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-10-22 08:56:01 UTC (rev 191448)
@@ -608,7 +608,6 @@
html/HTMLAreaElement.idl
html/HTMLBRElement.idl
html/HTMLBaseElement.idl
- html/HTMLBaseFontElement.idl
html/HTMLBodyElement.idl
html/HTMLButtonElement.idl
html/HTMLCanvasElement.idl
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp (191447 => 191448)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2015-10-22 08:56:01 UTC (rev 191448)
@@ -24,7 +24,6 @@
#include "JSMainThreadExecState.h"
#include "WebKitDOMDocumentPrivate.h"
#include "WebKitDOMElementPrivate.h"
-#include "WebKitDOMHTMLElement.h"
#include "WebKitDOMNodeListPrivate.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
@@ -155,3 +154,46 @@
g_warning("%s: EntityReference has been removed from DOM spec, this function does nothing.", __func__);
return nullptr;
}
+
+G_DEFINE_TYPE(WebKitDOMHTMLBaseFontElement, webkit_dom_html_base_font_element, WEBKIT_DOM_TYPE_HTML_ELEMENT)
+
+static void webkit_dom_html_base_font_element_init(WebKitDOMHTMLBaseFontElement*)
+{
+}
+
+static void webkit_dom_html_base_font_element_class_init(WebKitDOMHTMLBaseFontElementClass*)
+{
+}
+
+gchar* webkit_dom_html_base_font_element_get_color(WebKitDOMHTMLBaseFontElement*)
+{
+ g_warning("%s: HTMLBaseFont has been removed from DOM spec, this function does nothing.", __func__);
+ return nullptr;
+}
+
+void webkit_dom_html_base_font_element_set_color(WebKitDOMHTMLBaseFontElement*, const gchar*)
+{
+ g_warning("%s: HTMLBaseFont has been removed from DOM spec, this function does nothing.", __func__);
+}
+
+gchar* webkit_dom_html_base_font_element_get_face(WebKitDOMHTMLBaseFontElement*)
+{
+ g_warning("%s: HTMLBaseFont has been removed from DOM spec, this function does nothing.", __func__);
+ return nullptr;
+}
+
+void webkit_dom_html_base_font_element_set_face(WebKitDOMHTMLBaseFontElement*, const gchar*)
+{
+ g_warning("%s: HTMLBaseFont has been removed from DOM spec, this function does nothing.", __func__);
+}
+
+glong webkit_dom_html_base_font_element_get_size(WebKitDOMHTMLBaseFontElement*)
+{
+ g_warning("%s: HTMLBaseFont has been removed from DOM spec, this function does nothing.", __func__);
+ return 0;
+}
+
+void webkit_dom_html_base_font_element_set_size(WebKitDOMHTMLBaseFontElement*, glong)
+{
+ g_warning("%s: HTMLBaseFont has been removed from DOM spec, this function does nothing.", __func__);
+}
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h (191447 => 191448)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2015-10-22 08:56:01 UTC (rev 191448)
@@ -23,6 +23,7 @@
#include <glib.h>
#include <webkitdom/WebKitDOMNode.h>
+#include <webkitdom/WebKitDOMHTMLElement.h>
#include <webkitdom/webkitdomdefines.h>
G_BEGIN_DECLS
@@ -216,6 +217,102 @@
*/
WEBKIT_DEPRECATED WebKitDOMEntityReference* webkit_dom_document_create_entity_reference(WebKitDOMDocument* self, const gchar* name, GError** error);
+#define WEBKIT_DOM_TYPE_HTML_BASE_FONT_ELEMENT (webkit_dom_html_base_font_element_get_type())
+#define WEBKIT_DOM_HTML_BASE_FONT_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_HTML_BASE_FONT_ELEMENT, WebKitDOMHTMLBaseFontElement))
+#define WEBKIT_DOM_HTML_BASE_FONT_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_DOM_TYPE_HTML_BASE_FONT_ELEMENT, WebKitDOMHTMLBaseFontElementClass)
+#define WEBKIT_DOM_IS_HTML_BASE_FONT_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_HTML_BASE_FONT_ELEMENT))
+#define WEBKIT_DOM_IS_HTML_BASE_FONT_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_DOM_TYPE_HTML_BASE_FONT_ELEMENT))
+#define WEBKIT_DOM_HTML_BASE_FONT_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_DOM_TYPE_HTML_BASE_FONT_ELEMENT, WebKitDOMHTMLBaseFontElementClass))
+
+typedef struct _WebKitDOMHTMLBaseFontElement WebKitDOMHTMLBaseFontElement;
+typedef struct _WebKitDOMHTMLBaseFontElementClass WebKitDOMHTMLBaseFontElementClass;
+
+struct _WebKitDOMHTMLBaseFontElement {
+ WebKitDOMHTMLElement parent_instance;
+};
+
+struct _WebKitDOMHTMLBaseFontElementClass {
+ WebKitDOMHTMLElementClass parent_class;
+};
+
+WEBKIT_DEPRECATED GType
+webkit_dom_html_base_font_element_get_type(void);
+
+/**
+ * webkit_dom_html_base_font_element_get_color:
+ * @self: A #WebKitDOMHTMLBaseFontElement
+ *
+ * This function has been removed from the DOM spec and it just returns %NULL.
+ *
+ * Returns: A #gchar
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED gchar*
+webkit_dom_html_base_font_element_get_color(WebKitDOMHTMLBaseFontElement* self);
+
+/**
+ * webkit_dom_html_base_font_element_set_color:
+ * @self: A #WebKitDOMHTMLBaseFontElement
+ * @value: A #gchar
+ *
+ * This function has been removed from the DOM spec and it does nothing.
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED void
+webkit_dom_html_base_font_element_set_color(WebKitDOMHTMLBaseFontElement* self, const gchar* value);
+
+/**
+ * webkit_dom_html_base_font_element_get_face:
+ * @self: A #WebKitDOMHTMLBaseFontElement
+ *
+ * This function has been removed from the DOM spec and it just returns %NULL.
+ *
+ * Returns: A #gchar
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED gchar*
+webkit_dom_html_base_font_element_get_face(WebKitDOMHTMLBaseFontElement* self);
+
+/**
+ * webkit_dom_html_base_font_element_set_face:
+ * @self: A #WebKitDOMHTMLBaseFontElement
+ * @value: A #gchar
+ *
+ * This function has been removed from the DOM spec and it does nothing.
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED void
+webkit_dom_html_base_font_element_set_face(WebKitDOMHTMLBaseFontElement* self, const gchar* value);
+
+/**
+ * webkit_dom_html_base_font_element_get_size:
+ * @self: A #WebKitDOMHTMLBaseFontElement
+ *
+ * This function has been removed from the DOM spec and it just returns 0.
+ *
+ * Returns: A #glong
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED glong
+webkit_dom_html_base_font_element_get_size(WebKitDOMHTMLBaseFontElement* self);
+
+/**
+ * webkit_dom_html_base_font_element_set_size:
+ * @self: A #WebKitDOMHTMLBaseFontElement
+ * @value: A #glong
+ *
+ * This function has been removed from the DOM spec and it does nothing.
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED void
+webkit_dom_html_base_font_element_set_size(WebKitDOMHTMLBaseFontElement* self, glong value);
+
G_END_DECLS
#endif /* WEBKIT_DISABLE_DEPRECATED */
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols (191447 => 191448)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2015-10-22 08:56:01 UTC (rev 191448)
@@ -13,3 +13,10 @@
gboolean webkit_dom_tree_walker_get_expand_entity_references(WebKitDOMTreeWalker*)
WebKitDOMEntityReference* webkit_dom_document_create_entity_reference(WebKitDOMDocument*, const gchar*, GError**)
gboolean webkit_dom_node_iterator_get_expand_entity_references(WebKitDOMNodeIterator*)
+GType webkit_dom_html_base_font_element_get_type(void)
+gchar* webkit_dom_html_base_font_element_get_color(WebKitDOMHTMLBaseFontElement*)
+gchar* webkit_dom_html_base_font_element_get_face(WebKitDOMHTMLBaseFontElement*)
+glong webkit_dom_html_base_font_element_get_size(WebKitDOMHTMLBaseFontElement*)
+void webkit_dom_html_base_font_element_set_color(WebKitDOMHTMLBaseFontElement*, const gchar*)
+void webkit_dom_html_base_font_element_set_face(WebKitDOMHTMLBaseFontElement*, const gchar*)
+void webkit_dom_html_base_font_element_set_size(WebKitDOMHTMLBaseFontElement*, glong)
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp (191447 => 191448)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp 2015-10-22 08:56:01 UTC (rev 191448)
@@ -95,7 +95,6 @@
#include "WebKitDOMHTMLAreaElementPrivate.h"
#include "WebKitDOMHTMLBRElementPrivate.h"
#include "WebKitDOMHTMLBaseElementPrivate.h"
-#include "WebKitDOMHTMLBaseFontElementPrivate.h"
#include "WebKitDOMHTMLBodyElementPrivate.h"
#include "WebKitDOMHTMLButtonElementPrivate.h"
#include "WebKitDOMHTMLCanvasElementPrivate.h"
@@ -173,7 +172,6 @@
macro(applet, Applet) \
macro(area, Area) \
macro(base, Base) \
- macro(basefont, BaseFont) \
macro(blockquote, Quote) \
macro(body, Body) \
macro(br, BR) \
Modified: trunk/Source/WebCore/html/HTMLBaseFontElement.h (191447 => 191448)
--- trunk/Source/WebCore/html/HTMLBaseFontElement.h 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/html/HTMLBaseFontElement.h 2015-10-22 08:56:01 UTC (rev 191448)
@@ -27,7 +27,7 @@
namespace WebCore {
-// Only used by ObjC / Gobject bindings.
+// Only used by ObjC bindings.
class HTMLBaseFontElement final : public HTMLElement {
private:
HTMLBaseFontElement(const QualifiedName&, Document&);
Modified: trunk/Source/WebCore/html/HTMLBaseFontElement.idl (191447 => 191448)
--- trunk/Source/WebCore/html/HTMLBaseFontElement.idl 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Source/WebCore/html/HTMLBaseFontElement.idl 2015-10-22 08:56:01 UTC (rev 191448)
@@ -17,18 +17,14 @@
* Boston, MA 02110-1301, USA.
*/
-#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
[
NoInterfaceObject
] interface HTMLBaseFontElement : HTMLElement {
[Reflect] attribute DOMString color;
[Reflect] attribute DOMString face;
-#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
[Reflect] attribute DOMString size; // this changed to a long, but our existing API is a string
-#else
- [Reflect] attribute long size;
-#endif
};
#endif
Modified: trunk/Tools/ChangeLog (191447 => 191448)
--- trunk/Tools/ChangeLog 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Tools/ChangeLog 2015-10-22 08:56:01 UTC (rev 191448)
@@ -1,3 +1,12 @@
+2015-10-22 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK+ build after r191423.
+
+ Add WebKitDOMHTMLBaseFontElement to the list of deleted classes.
+
+ * gtk/webkitdom.py:
+ (WebKitDOMDocGenerator):
+
2015-10-22 Aakash Jain <aakash_j...@apple.com>
[Win][EFL][GTK] webkitpy test failed after r191374.
Modified: trunk/Tools/gtk/webkitdom.py (191447 => 191448)
--- trunk/Tools/gtk/webkitdom.py 2015-10-22 08:08:23 UTC (rev 191447)
+++ trunk/Tools/gtk/webkitdom.py 2015-10-22 08:56:01 UTC (rev 191448)
@@ -27,7 +27,7 @@
class WebKitDOMDocGenerator(object):
- DELETED_CLASSES = ["WebKitDOMEntityReference"]
+ DELETED_CLASSES = ["WebKitDOMEntityReference", "WebKitDOMHTMLBaseFontElement"]
def __init__(self, symbol_files, file_handle):
self._symbol_files = symbol_files
