Title: [128826] trunk/Source
- Revision
- 128826
- Author
- [email protected]
- Date
- 2012-09-17 17:12:13 -0700 (Mon, 17 Sep 2012)
Log Message
Source/WebCore: Unreviewed, fix build.
Patch by Filip Pizlo <[email protected]> on 2012-09-17
* css/CSSRule.cpp:
(SameSizeAsCSSRule):
Source/WebKit2: Fixing the build after http://trac.webkit.org/changeset/128813
* WebProcess/Plugins/Netscape/JSNPObject.cpp:
(WebKit):
(WebKit::JSNPObject::JSNPObject):
* WebProcess/Plugins/Netscape/JSNPObject.h:
(JSNPObject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128825 => 128826)
--- trunk/Source/WebCore/ChangeLog 2012-09-18 00:00:50 UTC (rev 128825)
+++ trunk/Source/WebCore/ChangeLog 2012-09-18 00:12:13 UTC (rev 128826)
@@ -45,48 +45,6 @@
* bridge/runtime_object.h:
(RuntimeObject):
-<<<<<<< .mine
-2012-09-16 Mark Hahnenberg <[email protected]>
-
- Delayed structure sweep can leak structures without bound
- https://bugs.webkit.org/show_bug.cgi?id=96546
-
- Reviewed by Gavin Barraclough.
-
- This patch gets rid of the separate Structure allocator in the MarkedSpace and adds two new destructor-only
- allocators. We now have separate allocators for our three types of objects: those objects with no destructors,
- those objects with destructors and with immortal structures, and those objects with destructors that don't have
- immortal structures. All of the objects of the third type (destructors without immortal structures) now
- inherit from a new class named JSDestructibleObject (which in turn is a subclass of JSNonFinalObject), which stores
- the ClassInfo for these classes at a fixed offset for safe retrieval during sweeping/destruction.
-
- No new tests.
-
- * ForwardingHeaders/runtime/JSDestructableObject.h: Added.
- * bindings/js/JSDOMWrapper.h: Inherits from JSDestructibleObject.
- (JSDOMWrapper):
- (WebCore::JSDOMWrapper::JSDOMWrapper):
- * bindings/scripts/CodeGeneratorJS.pm: Add finalizers to anything that inherits from JSGlobalObject,
- e.g. JSDOMWindow and JSWorkerContexts. For those classes we also need to use the NEEDS_DESTRUCTOR macro.
- (GenerateHeader):
- * bridge/objc/objc_runtime.h: Inherit from JSDestructibleObject.
- (ObjcFallbackObjectImp):
- * bridge/objc/objc_runtime.mm:
- (Bindings):
- (JSC::Bindings::ObjcFallbackObjectImp::ObjcFallbackObjectImp):
- * bridge/runtime_array.cpp: Use a finalizer so that JSArray isn't forced to inherit from JSDestructibleObject.
- (JSC):
- (JSC::RuntimeArray::destroy):
- * bridge/runtime_array.h:
- (JSC::RuntimeArray::create):
- (JSC):
- * bridge/runtime_object.cpp: Inherit from JSDestructibleObject.
- (Bindings):
- (JSC::Bindings::RuntimeObject::RuntimeObject):
- * bridge/runtime_object.h:
- (RuntimeObject):
-
-=======
2012-09-17 Sheriff Bot <[email protected]>
Unreviewed, rolling out r128809.
@@ -450,7 +408,6 @@
(.css-named-flow-collections-view .region-overset::before):
(.css-named-flow-collections-view .split-view-contents .named-flow-element):
->>>>>>> .r128811
2012-09-17 Zan Dobersek <[email protected]>
[Gtk] Remove configuration options for stable features that are currently enabled
Modified: trunk/Source/WebKit2/ChangeLog (128825 => 128826)
--- trunk/Source/WebKit2/ChangeLog 2012-09-18 00:00:50 UTC (rev 128825)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-18 00:12:13 UTC (rev 128826)
@@ -1,3 +1,13 @@
+2012-09-17 Mark Hahnenberg <[email protected]>
+
+ Fixing the build after http://trac.webkit.org/changeset/128813
+
+ * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+ (WebKit):
+ (WebKit::JSNPObject::JSNPObject):
+ * WebProcess/Plugins/Netscape/JSNPObject.h:
+ (JSNPObject):
+
2012-09-17 Anders Carlsson <[email protected]>
Crash if we fail to allocate memory for the argument encoder buffer.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (128825 => 128826)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-09-18 00:00:50 UTC (rev 128825)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-09-18 00:12:13 UTC (rev 128826)
@@ -54,10 +54,10 @@
return static_cast<NPIdentifier>(IdentifierRep::get(name.utf8().data()));
}
-const ClassInfo JSNPObject::s_info = { "NPObject", &JSNonFinalObject::s_info, 0, 0, CREATE_METHOD_TABLE(JSNPObject) };
+const ClassInfo JSNPObject::s_info = { "NPObject", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSNPObject) };
JSNPObject::JSNPObject(JSGlobalObject* globalObject, Structure* structure, NPRuntimeObjectMap* objectMap, NPObject* npObject)
- : JSNonFinalObject(globalObject->globalData(), structure)
+ : JSDestructibleObject(globalObject->globalData(), structure)
, m_objectMap(objectMap)
, m_npObject(npObject)
{
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h (128825 => 128826)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2012-09-18 00:00:50 UTC (rev 128825)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2012-09-18 00:12:13 UTC (rev 128826)
@@ -41,9 +41,9 @@
// JSNPObject is a JSObject that wraps an NPObject.
-class JSNPObject : public JSC::JSNonFinalObject {
+class JSNPObject : public JSC::JSDestructibleObject {
public:
- typedef JSC::JSNonFinalObject Base;
+ typedef JSC::JSDestructibleObject Base;
static JSNPObject* create(JSC::JSGlobalObject* globalObject, NPRuntimeObjectMap* objectMap, NPObject* npObject)
{
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
