Changeset 147924 in webkit
- Timestamp:
- Apr 8, 2013 10:20:32 AM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 2 added
- 2 deleted
- 40 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r147922 r147924 1 2013-04-08 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] DOM objects created wrapping a base class have incorrect GObject type 4 https://bugs.webkit.org/show_bug.cgi?id=113132 5 6 Reviewed by Gustavo Noronha Silva. 7 8 Some of the DOM methods can create a concrete instance of another 9 object, but return a base class. GObject bindings provide custom 10 kit implementations for Node, Element, Event and EvenTarget, so 11 any concrete HTMLElement wrapped as an HTMLElement ends up 12 wrapping the right WebCore object but in the wrong GObject type. 13 This affects not only HTMLElements, but any polymorphic object 14 wrapped using a base class. 15 This patch changes the way objects are created, so that all 16 classes have their own kit implementation, but for polymorphic 17 objects the kit implementation of the base class is always 18 used. The kit method of polymorphic base classes use a generic 19 wrap method instead of the wrapFoo method like all other 20 classes. In the static code we provide the implementation of the 21 generic wrap method for every polimorphic base class, falling back 22 to their wrapFoo method if the concrete object can't be used to 23 wrap the object. 24 Both WebKitDOMBinding and WebKitHTMLElementWrapperFactory now provide 25 implementations of wrap and have been renamed to WebKitDOMPrivate 26 and WebKitDOMHTMLPrivate. 27 28 * bindings/gobject/GNUmakefile.am: 29 * bindings/gobject/WebKitDOMBinding.cpp: Removed. 30 * bindings/gobject/WebKitDOMEventTarget.cpp: 31 (WebKit::kit): Moved kit implementation from WebKitDOMBinding for 32 consistency with all other objects that have their own kit. 33 (WebKit::core): Updated to match the core implementation fo all 34 other objects. 35 * bindings/gobject/WebKitDOMEventTargetPrivate.h: 36 (WebCore): 37 (WebKit): 38 * bindings/gobject/WebKitDOMHTMLPrivate.cpp: Added. 39 (WebKit): Use preprocessor macros to define and set the wrap 40 functions of all HTML elements, removing a lot of boilerplate code 41 and making it easier to add new wrap functions in the future. 42 (WebKit::wrap): 43 * bindings/gobject/WebKitDOMHTMLPrivate.h: Renamed from Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h. 44 (WebCore): 45 (WebKit): 46 * bindings/gobject/WebKitDOMObject.cpp: 47 * bindings/gobject/WebKitDOMPrivate.cpp: Added. 48 (WebKit): 49 (WebKit::wrap): 50 * bindings/gobject/WebKitDOMPrivate.h: Renamed from Source/WebCore/bindings/gobject/WebKitDOMBinding.h. 51 (WebCore): 52 (WebKit): 53 * bindings/gobject/WebKitHTMLElementWrapperFactory.cpp: Removed. 54 * bindings/scripts/CodeGeneratorGObject.pm: 55 (IsBaseType): Helper function to check if a type is a base class. 56 (GetBaseClass): Helper function to get the base class for a given 57 parent type. 58 (GenerateFunction): Remove special case for EventTarget since the 59 kit prototype of EventTarget is in its private header like all 60 other objects. 61 (GenerateCFile): Add a kit implementation for all objects. 62 (IsPolymorphic): Helper function to check if the given type is the 63 base class of a polymorphic object. 64 (Generate): Include the private header of the base class for 65 polymorphic objects. 66 (WriteData): Remove the special case for WebKitDOMNode since now 67 all objects has a kit method. 68 * bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp: 69 (WebKit::kit): 70 * bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h: 71 (WebKit): 72 * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp: 73 * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h: 74 (WebKit): 75 * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp: 76 * bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h: 77 (WebKit): 78 * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp: 79 * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h: 80 (WebKit): 81 * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp: 82 * bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h: 83 (WebKit): 84 * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp: 85 * bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h: 86 (WebKit): 87 * bindings/scripts/test/GObject/WebKitDOMTestException.cpp: 88 * bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h: 89 (WebKit): 90 * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp: 91 * bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h: 92 (WebKit): 93 * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp: 94 * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h: 95 (WebKit): 96 * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp: 97 * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h: 98 (WebKit): 99 * bindings/scripts/test/GObject/WebKitDOMTestNode.cpp: 100 (WebKit::kit): 101 * bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h: 102 (WebKit): 103 * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp: 104 * bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h: 105 (WebKit): 106 * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp: 107 * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructorsPrivate.h: 108 (WebKit): 109 * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp: 110 * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h: 111 (WebKit): 112 * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp: 113 * bindings/scripts/test/GObject/WebKitDOMTestTypedefsPrivate.h: 114 (WebKit): 115 1 116 2013-04-08 Andras Becsi <andras.becsi@digia.com> 2 117 -
trunk/Source/WebCore/bindings/gobject/GNUmakefile.am
r145782 r147924 509 509 Source/WebCore/bindings/gobject/GObjectEventListener.cpp \ 510 510 Source/WebCore/bindings/gobject/GObjectEventListener.h \ 511 Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp \512 Source/WebCore/bindings/gobject/WebKitDOMBinding.h \513 511 Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp \ 514 512 Source/WebCore/bindings/gobject/WebKitDOMCustom.h \ … … 516 514 Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h \ 517 515 Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ 516 Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp \ 517 Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h \ 518 518 Source/WebCore/bindings/gobject/WebKitDOMObject.cpp \ 519 519 Source/WebCore/bindings/gobject/WebKitDOMObject.h \ 520 Source/WebCore/bindings/gobject/WebKit HTMLElementWrapperFactory.cpp \521 Source/WebCore/bindings/gobject/WebKit HTMLElementWrapperFactory.h520 Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp \ 521 Source/WebCore/bindings/gobject/WebKitDOMPrivate.h 522 522 523 523 libWebCoreDOM_la_CXXFLAGS = \ -
trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp
r133893 r147924 32 32 #include "WebKitDOMEventTarget.h" 33 33 34 #include "DOMObjectCache.h" 35 #include "EventTarget.h" 34 36 #include "WebKitDOMEvent.h" 35 37 #include "WebKitDOMEventTargetPrivate.h" 38 #include "WebKitDOMPrivate.h" 36 39 37 40 typedef WebKitDOMEventTargetIface WebKitDOMEventTargetInterface; … … 105 108 namespace WebKit { 106 109 110 WebKitDOMEventTarget* kit(WebCore::EventTarget* obj) 111 { 112 if (!obj) 113 return 0; 114 115 if (gpointer ret = DOMObjectCache::get(obj)) 116 return WEBKIT_DOM_EVENT_TARGET(ret); 117 118 return wrap(obj); 119 } 120 107 121 WebCore::EventTarget* core(WebKitDOMEventTarget* request) 108 122 { 109 g_return_val_if_fail(request, 0); 110 111 WebCore::EventTarget* coreObject = static_cast<WebCore::EventTarget*>(WEBKIT_DOM_OBJECT(request)->coreObject); 112 g_return_val_if_fail(coreObject, 0); 113 114 return coreObject; 123 return request ? static_cast<WebCore::EventTarget*>(WEBKIT_DOM_OBJECT(request)->coreObject) : 0; 115 124 } 116 125 -
trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h
r137329 r147924 21 21 #define WebKitDOMEventTargetPrivate_h 22 22 23 #include "EventTarget.h"24 23 #include <webkitdom/WebKitDOMEventTarget.h> 25 24 25 namespace WebCore { 26 class EventTarget; 27 } 28 26 29 namespace WebKit { 27 WebCore::EventTarget* core(WebKitDOMEventTarget* request); 30 WebKitDOMEventTarget* kit(WebCore::EventTarget*); 31 WebCore::EventTarget* core(WebKitDOMEventTarget*); 28 32 } // namespace WebKit 29 33 -
trunk/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h
r147922 r147924 1 1 /* 2 * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2010 Igalia S.L. 2 * Copyright (C) 2013 Igalia S.L. 4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 25 24 */ 26 25 27 #ifndef WebKit HTMLElementWrapperFactory_h28 #define WebKit HTMLElementWrapperFactory_h26 #ifndef WebKitDOMHTMLPrivate_h 27 #define WebKitDOMHTMLPrivate_h 29 28 30 #include "HTMLElement.h" 29 #include <webkitdom/webkitdomdefines.h> 30 31 namespace WebCore { 32 class HTMLElement; 33 } 31 34 32 35 namespace WebKit { 33 gpointer createHTMLElementWrapper(PassRefPtr<WebCore::HTMLElement>);36 WebKitDOMHTMLElement* wrap(WebCore::HTMLElement*); 34 37 } 35 38 36 #endif // WebKit HTMLElementWrapperFactory_h39 #endif // WebKitDOMHTMLPrivate_h -
trunk/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp
r133893 r147924 8 8 #include "config.h" 9 9 #include "WebKitDOMObject.h" 10 11 #include "WebKitDOMBinding.h"12 10 13 11 enum { -
trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h
r147922 r147924 5 5 * Copyright (C) 2008 Luke Kenneth Casson Leighton <lkcl@lkcl.net> 6 6 * Copyright (C) 2008 Martin Soto <soto@freedesktop.org> 7 * Copyright (C) 2009-201 0Igalia S.L.7 * Copyright (C) 2009-2013 Igalia S.L. 8 8 * 9 9 * This library is free software; you can redistribute it and/or … … 22 22 */ 23 23 24 #ifndef WebKitDOM Binding_h25 #define WebKitDOM Binding_h24 #ifndef WebKitDOMPrivate_h 25 #define WebKitDOMPrivate_h 26 26 27 27 #include <webkitdom/webkitdomdefines.h> 28 28 29 #define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE |G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))30 #define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE |G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))29 #define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)) 30 #define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)) 31 31 #define WEBKIT_WARN_FEATURE_NOT_PRESENT(Feature) g_warning("WebKitGTK+ was not compiled with support for " Feature); 32 32 33 33 namespace WebCore { 34 34 class Node; 35 class Element;36 class HTMLElement;37 35 class Event; 36 class StyleSheet; 37 class HTMLCollection; 38 38 class EventTarget; 39 class Blob; 39 40 } // namespace WebCore 40 41 41 42 namespace WebKit { 42 WebKitDOMNode* kit(WebCore::Node* node); 43 WebKitDOMElement* kit(WebCore::Element* element); 44 WebKitDOMHTMLElement* kit(WebCore::HTMLElement*); 45 WebKitDOMEvent* kit(WebCore::Event* event); 46 WebKitDOMEventTarget* kit(WebCore::EventTarget* target); 43 WebKitDOMNode* wrap(WebCore::Node*); 44 WebKitDOMEvent* wrap(WebCore::Event*); 45 WebKitDOMStyleSheet* wrap(WebCore::StyleSheet*); 46 WebKitDOMHTMLCollection* wrap(WebCore::HTMLCollection*); 47 WebKitDOMEventTarget* wrap(WebCore::EventTarget*); 48 WebKitDOMBlob* wrap(WebCore::Blob*); 47 49 } // namespace WebKit 48 50 49 #endif // WebKitDOM Binding_h51 #endif // WebKitDOMPrivate_h -
trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
r146721 r147924 38 38 my $className = ""; 39 39 40 # FIXME: this should be replaced with a function that recurses up the tree 41 # to find the actual base type. 42 my %baseTypeHash = ("Object" => 1, "Node" => 1, "NodeList" => 1, "NamedNodeMap" => 1, "DOMImplementation" => 1, 43 "Event" => 1, "CSSRule" => 1, "CSSValue" => 1, "StyleSheet" => 1, "MediaList" => 1, 44 "Counter" => 1, "Rect" => 1, "RGBColor" => 1, "XPathExpression" => 1, "XPathResult" => 1, 45 "NodeIterator" => 1, "TreeWalker" => 1, "AbstractView" => 1, "Blob" => 1, "DOMTokenList" => 1, 46 "HTMLCollection" => 1); 47 40 48 # Default constructor 41 49 sub new { … … 83 91 return $interface->parents(0); 84 92 } 93 94 sub IsBaseType 95 { 96 my $type = shift; 97 98 return 1 if $baseTypeHash{$type}; 99 return 0; 100 } 101 102 sub GetBaseClass 103 { 104 $parent = shift; 105 106 return $parent if $parent eq "Object" or IsBaseType($parent); 107 return "Event" if $parent eq "UIEvent" or $parent eq "MouseEvent"; 108 return "CSSValue" if $parent eq "SVGColor" or $parent eq "CSSValueList"; 109 return "Node"; 110 } 111 85 112 86 113 # From String::CamelCase 0.01 … … 898 925 899 926 if ($returnType ne "void" && $returnValueIsGDOMType && $functionSigType ne "any") { 900 if ($functionSigType ne "EventTarget") { 901 $implIncludes{"WebKitDOM${functionSigType}Private.h"} = 1; 902 } else { 903 $implIncludes{"WebKitDOM${functionSigType}.h"} = 1; 904 } 927 $implIncludes{"WebKitDOM${functionSigType}Private.h"} = 1; 905 928 } 906 929 … … 1251 1274 my $lowerCaseIfaceName = "webkit_dom_" . FixUpDecamelizedName(decamelize($interfaceName)); 1252 1275 my $parentImplClassName = GetParentImplClassName($interface); 1276 my $baseClassName = GetBaseClass($parentImplClassName); 1253 1277 1254 1278 # Add a private struct only for direct subclasses of Object so that we can use RefPtr … … 1270 1294 push(@cBodyProperties, $implContent); 1271 1295 1272 if (!UsesManualKitImplementation($interfaceName)) { 1273 $implContent = << "EOF"; 1274 ${className}* kit(WebCore::$interfaceName* obj) 1275 { 1276 if (!obj) 1277 return 0; 1278 1279 if (gpointer ret = DOMObjectCache::get(obj)) 1280 return WEBKIT_DOM_${clsCaps}(ret); 1281 1282 return wrap${interfaceName}(obj); 1283 } 1284 1285 EOF 1286 push(@cBodyPriv, $implContent); 1296 if ($parentImplClassName eq "Object") { 1297 push(@cBodyPriv, "${className}* kit(WebCore::$interfaceName* obj)\n"); 1298 push(@cBodyPriv, "{\n"); 1299 push(@cBodyPriv, " if (!obj)\n"); 1300 push(@cBodyPriv, " return 0;\n\n"); 1301 push(@cBodyPriv, " if (gpointer ret = DOMObjectCache::get(obj))\n"); 1302 push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(ret);\n\n"); 1303 if (IsPolymorphic($interfaceName)) { 1304 push(@cBodyPriv, " return wrap(obj);\n"); 1305 } else { 1306 push(@cBodyPriv, " return wrap${interfaceName}(obj);\n"); 1307 } 1308 push(@cBodyPriv, "}\n\n"); 1309 } else { 1310 push(@cBodyPriv, "${className}* kit(WebCore::$interfaceName* obj)\n"); 1311 push(@cBodyPriv, "{\n"); 1312 if (!IsPolymorphic($baseClassName)) { 1313 push(@cBodyPriv, " if (!obj)\n"); 1314 push(@cBodyPriv, " return 0;\n\n"); 1315 push(@cBodyPriv, " if (gpointer ret = DOMObjectCache::get(obj))\n"); 1316 push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(ret);\n\n"); 1317 push(@cBodyPriv, " return wrap${interfaceName}(obj);\n"); 1318 } else { 1319 push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(kit(static_cast<WebCore::$baseClassName*>(obj)));\n"); 1320 } 1321 push(@cBodyPriv, "}\n\n"); 1287 1322 } 1288 1323 … … 1316 1351 } 1317 1352 1318 sub UsesManualKitImplementation{1353 sub IsPolymorphic { 1319 1354 my $type = shift; 1320 1355 1321 return 1 if $type eq "Node" or $type eq "Element" or $type eq "HTMLElement" or $type eq "Event"; 1356 # FIXME: should we use ObjCPolymorphic attribute? or is it specific to ObjC bindings? 1357 return 1 if $type eq "Node" or $type eq "Event" or $type eq "HTMLCollection" or $type eq "StyleSheet" or $type eq "Blob"; 1322 1358 return 0; 1323 1359 } … … 1382 1418 my $parentGObjType = GetParentGObjType($interface); 1383 1419 my $interfaceName = $interface->name; 1420 my $parentImplClassName = GetParentImplClassName($interface); 1421 my $baseClassName = GetBaseClass($parentImplClassName); 1384 1422 1385 1423 # Add the default impl header template … … 1388 1426 1389 1427 $implIncludes{"DOMObjectCache.h"} = 1; 1390 $implIncludes{"WebKitDOM Binding.h"} = 1;1428 $implIncludes{"WebKitDOMPrivate.h"} = 1; 1391 1429 $implIncludes{"gobject/ConvertToUTF8String.h"} = 1; 1392 1430 $implIncludes{"${className}Private.h"} = 1; … … 1394 1432 $implIncludes{"ExceptionCode.h"} = 1; 1395 1433 $implIncludes{"CSSImportRule.h"} = 1; 1434 if ($parentImplClassName ne "Object" and IsPolymorphic($baseClassName)) { 1435 $implIncludes{"WebKitDOM${baseClassName}Private.h"} = 1; 1436 } 1396 1437 1397 1438 $hdrIncludes{"webkitdom/${parentClassName}.h"} = 1; … … 1436 1477 namespace WebKit { 1437 1478 ${className}* wrap${interfaceName}(WebCore::${interfaceName}*); 1438 WebCore::${interfaceName}* core(${className}* request); 1479 ${className}* kit(WebCore::${interfaceName}*); 1480 WebCore::${interfaceName}* core(${className}*); 1439 1481 EOF 1440 1482 1441 1483 print PRIVHEADER $text; 1442 1443 if ($className ne "WebKitDOMNode") {1444 print PRIVHEADER "${className}* kit(WebCore::${interfaceName}* node);\n"1445 }1446 1484 1447 1485 $text = << "EOF"; -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOMBinding.h"29 28 #include "WebKitDOMFloat32ArrayPrivate.h" 30 29 #include "WebKitDOMFloat64ArrayPrivate.h" 31 30 #include "WebKitDOMInt32ArrayPrivate.h" 31 #include "WebKitDOMNodePrivate.h" 32 #include "WebKitDOMPrivate.h" 32 33 #include "gobject/ConvertToUTF8String.h" 33 34 #include <wtf/GetPtr.h> … … 38 39 WebKitDOMFloat64Array* kit(WebCore::Float64Array* obj) 39 40 { 40 if (!obj) 41 return 0; 42 43 if (gpointer ret = DOMObjectCache::get(obj)) 44 return WEBKIT_DOM_FLOAT64ARRAY(ret); 45 46 return wrapFloat64Array(obj); 41 return WEBKIT_DOM_FLOAT64ARRAY(kit(static_cast<WebCore::Node*>(obj))); 47 42 } 48 43 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array*); 29 Web Core::Float64Array* core(WebKitDOMFloat64Array* request);30 Web KitDOMFloat64Array* kit(WebCore::Float64Array* node);29 WebKitDOMFloat64Array* kit(WebCore::Float64Array*); 30 WebCore::Float64Array* core(WebKitDOMFloat64Array*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOMBinding.h"29 28 #include "WebKitDOMNodePrivate.h" 29 #include "WebKitDOMPrivate.h" 30 30 #include "WebKitDOMTestActiveDOMObjectPrivate.h" 31 31 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObject*); 29 Web Core::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject* request);30 Web KitDOMTestActiveDOMObject* kit(WebCore::TestActiveDOMObject* node);29 WebKitDOMTestActiveDOMObject* kit(WebCore::TestActiveDOMObject*); 30 WebCore::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOMBinding.h"29 28 #include "WebKitDOMClass1Private.h" 30 29 #include "WebKitDOMClass2Private.h" … … 32 31 #include "WebKitDOMClass8Private.h" 33 32 #include "WebKitDOMDOMStringListPrivate.h" 33 #include "WebKitDOMPrivate.h" 34 34 #include "WebKitDOMTestCallbackPrivate.h" 35 35 #include "WebKitDOMThisClassPrivate.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
r137329 r147924 28 28 namespace WebKit { 29 29 WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback*); 30 Web Core::TestCallback* core(WebKitDOMTestCallback* request);31 Web KitDOMTestCallback* kit(WebCore::TestCallback* node);30 WebKitDOMTestCallback* kit(WebCore::TestCallback*); 31 WebCore::TestCallback* core(WebKitDOMTestCallback*); 32 32 } // namespace WebKit 33 33 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOM Binding.h"28 #include "WebKitDOMPrivate.h" 29 29 #include "WebKitDOMTestCustomNamedGetterPrivate.h" 30 30 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter*); 29 Web Core::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request);30 Web KitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter* node);29 WebKitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter*); 30 WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOM Binding.h"28 #include "WebKitDOMPrivate.h" 29 29 #include "WebKitDOMTestEventConstructorPrivate.h" 30 30 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstructor*); 29 Web Core::TestEventConstructor* core(WebKitDOMTestEventConstructor* request);30 Web KitDOMTestEventConstructor* kit(WebCore::TestEventConstructor* node);29 WebKitDOMTestEventConstructor* kit(WebCore::TestEventConstructor*); 30 WebCore::TestEventConstructor* core(WebKitDOMTestEventConstructor*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp
r143877 r147924 27 27 #include "GObjectEventListener.h" 28 28 #include "JSMainThreadExecState.h" 29 #include "WebKitDOMBinding.h"30 29 #include "WebKitDOMEventPrivate.h" 31 30 #include "WebKitDOMEventTarget.h" 32 31 #include "WebKitDOMNodePrivate.h" 32 #include "WebKitDOMPrivate.h" 33 33 #include "WebKitDOMTestEventTargetPrivate.h" 34 34 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget*); 29 Web Core::TestEventTarget* core(WebKitDOMTestEventTarget* request);30 Web KitDOMTestEventTarget* kit(WebCore::TestEventTarget* node);29 WebKitDOMTestEventTarget* kit(WebCore::TestEventTarget*); 30 WebCore::TestEventTarget* core(WebKitDOMTestEventTarget*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOM Binding.h"28 #include "WebKitDOMPrivate.h" 29 29 #include "WebKitDOMTestExceptionPrivate.h" 30 30 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestException* wrapTestException(WebCore::TestException*); 29 Web Core::TestException* core(WebKitDOMTestException* request);30 Web KitDOMTestException* kit(WebCore::TestException* node);29 WebKitDOMTestException* kit(WebCore::TestException*); 30 WebCore::TestException* core(WebKitDOMTestException*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
r143877 r147924 27 27 #include "JSMainThreadExecState.h" 28 28 #include "TestSupplemental.h" 29 #include "WebKitDOMBinding.h"30 29 #include "WebKitDOMNodePrivate.h" 30 #include "WebKitDOMPrivate.h" 31 31 #include "WebKitDOMTestInterfacePrivate.h" 32 32 #include "WebKitDOMTestObjPrivate.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
r137329 r147924 28 28 namespace WebKit { 29 29 WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface*); 30 Web Core::TestInterface* core(WebKitDOMTestInterface* request);31 Web KitDOMTestInterface* kit(WebCore::TestInterface* node);30 WebKitDOMTestInterface* kit(WebCore::TestInterface*); 31 WebCore::TestInterface* core(WebKitDOMTestInterface*); 32 32 } // namespace WebKit 33 33 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOM Binding.h"28 #include "WebKitDOMPrivate.h" 29 29 #include "WebKitDOMTestMediaQueryListListenerPrivate.h" 30 30 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener*); 29 Web Core::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener* request);30 Web KitDOMTestMediaQueryListListener* kit(WebCore::TestMediaQueryListListener* node);29 WebKitDOMTestMediaQueryListListener* kit(WebCore::TestMediaQueryListListener*); 30 WebCore::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOM Binding.h"28 #include "WebKitDOMPrivate.h" 29 29 #include "WebKitDOMTestNamedConstructorPrivate.h" 30 30 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstructor*); 29 Web Core::TestNamedConstructor* core(WebKitDOMTestNamedConstructor* request);30 Web KitDOMTestNamedConstructor* kit(WebCore::TestNamedConstructor* node);29 WebKitDOMTestNamedConstructor* kit(WebCore::TestNamedConstructor*); 30 WebCore::TestNamedConstructor* core(WebKitDOMTestNamedConstructor*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp
r143877 r147924 27 27 #include "GObjectEventListener.h" 28 28 #include "JSMainThreadExecState.h" 29 #include "WebKitDOMBinding.h"30 29 #include "WebKitDOMEventPrivate.h" 31 30 #include "WebKitDOMEventTarget.h" 31 #include "WebKitDOMNodePrivate.h" 32 #include "WebKitDOMPrivate.h" 32 33 #include "WebKitDOMTestNodePrivate.h" 33 34 #include "gobject/ConvertToUTF8String.h" … … 39 40 WebKitDOMTestNode* kit(WebCore::TestNode* obj) 40 41 { 41 if (!obj) 42 return 0; 43 44 if (gpointer ret = DOMObjectCache::get(obj)) 45 return WEBKIT_DOM_TEST_NODE(ret); 46 47 return wrapTestNode(obj); 42 return WEBKIT_DOM_TEST_NODE(kit(static_cast<WebCore::Node*>(obj))); 48 43 } 49 44 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestNode* wrapTestNode(WebCore::TestNode*); 29 Web Core::TestNode* core(WebKitDOMTestNode* request);30 Web KitDOMTestNode* kit(WebCore::TestNode* node);29 WebKitDOMTestNode* kit(WebCore::TestNode*); 30 WebCore::TestNode* core(WebKitDOMTestNode*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
r146161 r147924 27 27 #include "HTMLNames.h" 28 28 #include "JSMainThreadExecState.h" 29 #include "WebKitDOMBinding.h"30 29 #include "WebKitDOMDictionaryPrivate.h" 31 30 #include "WebKitDOMDocumentPrivate.h" 32 31 #include "WebKitDOMNodePrivate.h" 32 #include "WebKitDOMPrivate.h" 33 33 #include "WebKitDOMSVGPointPrivate.h" 34 34 #include "WebKitDOMSerializedScriptValuePrivate.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestObj* wrapTestObj(WebCore::TestObj*); 29 Web Core::TestObj* core(WebKitDOMTestObj* request);30 Web KitDOMTestObj* kit(WebCore::TestObj* node);29 WebKitDOMTestObj* kit(WebCore::TestObj*); 30 WebCore::TestObj* core(WebKitDOMTestObj*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp
r143877 r147924 26 26 #include "ExceptionCode.h" 27 27 #include "JSMainThreadExecState.h" 28 #include "WebKitDOM Binding.h"28 #include "WebKitDOMPrivate.h" 29 29 #include "WebKitDOMTestOverloadedConstructorsPrivate.h" 30 30 #include "gobject/ConvertToUTF8String.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructorsPrivate.h
r137329 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestOverloadedConstructors* wrapTestOverloadedConstructors(WebCore::TestOverloadedConstructors*); 29 Web Core::TestOverloadedConstructors* core(WebKitDOMTestOverloadedConstructors* request);30 Web KitDOMTestOverloadedConstructors* kit(WebCore::TestOverloadedConstructors* node);29 WebKitDOMTestOverloadedConstructors* kit(WebCore::TestOverloadedConstructors*); 30 WebCore::TestOverloadedConstructors* core(WebKitDOMTestOverloadedConstructors*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp
r143877 r147924 27 27 #include "JSMainThreadExecState.h" 28 28 #include "WebKitDOMArrayPrivate.h" 29 #include "WebKitDOMBinding.h"30 29 #include "WebKitDOMMessagePortArrayPrivate.h" 30 #include "WebKitDOMPrivate.h" 31 31 #include "WebKitDOMSerializedScriptValuePrivate.h" 32 32 #include "WebKitDOMTestSerializedScriptValueInterfacePrivate.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h
r137329 r147924 28 28 namespace WebKit { 29 29 WebKitDOMTestSerializedScriptValueInterface* wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface*); 30 Web Core::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptValueInterface* request);31 Web KitDOMTestSerializedScriptValueInterface* kit(WebCore::TestSerializedScriptValueInterface* node);30 WebKitDOMTestSerializedScriptValueInterface* kit(WebCore::TestSerializedScriptValueInterface*); 31 WebCore::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptValueInterface*); 32 32 } // namespace WebKit 33 33 -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp
r143877 r147924 27 27 #include "JSMainThreadExecState.h" 28 28 #include "WebKitDOMArrayPrivate.h" 29 #include "WebKitDOMBinding.h"30 29 #include "WebKitDOMDOMString[]Private.h" 30 #include "WebKitDOMPrivate.h" 31 31 #include "WebKitDOMSVGPointPrivate.h" 32 32 #include "WebKitDOMSerializedScriptValuePrivate.h" -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefsPrivate.h
r142865 r147924 27 27 namespace WebKit { 28 28 WebKitDOMTestTypedefs* wrapTestTypedefs(WebCore::TestTypedefs*); 29 Web Core::TestTypedefs* core(WebKitDOMTestTypedefs* request);30 Web KitDOMTestTypedefs* kit(WebCore::TestTypedefs* node);29 WebKitDOMTestTypedefs* kit(WebCore::TestTypedefs*); 30 WebCore::TestTypedefs* core(WebKitDOMTestTypedefs*); 31 31 } // namespace WebKit 32 32 -
trunk/Source/WebKit/gtk/ChangeLog
r147663 r147924 1 2013-04-08 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] DOM objects created wrapping a base class have incorrect GObject type 4 https://bugs.webkit.org/show_bug.cgi?id=113132 5 6 Reviewed by Gustavo Noronha Silva. 7 8 Remove WebKitDOMBindindg.h include from several files because it's 9 been renamed and it was not actually needed. 10 11 * WebCoreSupport/ChromeClientGtk.cpp: 12 * WebCoreSupport/EditorClientGtk.cpp: 13 * webkit/webkithittestresult.cpp: 14 1 15 2013-04-04 Martin Robinson <mrobinson@igalia.com> 2 16 -
trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r142755 r147924 52 52 #include "SearchPopupMenuGtk.h" 53 53 #include "SecurityOrigin.h" 54 #include "WebKitDOMBinding.h"55 54 #include "WebKitDOMHTMLElementPrivate.h" 56 55 #include "WindowFeatures.h" -
trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
r145849 r147924 41 41 #include "StylePropertySet.h" 42 42 #include "UndoStep.h" 43 #include "WebKitDOMBinding.h"44 43 #include "WebKitDOMCSSStyleDeclarationPrivate.h" 45 44 #include "WebKitDOMHTMLElementPrivate.h" -
trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp
r135405 r147924 26 26 #include "HitTestResult.h" 27 27 #include "KURL.h" 28 #include "WebKitDOMBinding.h" 29 #include "WebKitDOMNode.h" 28 #include "WebKitDOMNodePrivate.h" 30 29 #include "webkitenumtypes.h" 31 30 #include "webkitglobals.h"
Note: See TracChangeset
for help on using the changeset viewer.