Diff
Modified: trunk/Source/WebCore/ChangeLog (101400 => 101401)
--- trunk/Source/WebCore/ChangeLog 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/ChangeLog 2011-11-29 19:44:07 UTC (rev 101401)
@@ -1,3 +1,39 @@
+2011-11-29 Oliver Hunt <oli...@apple.com>
+
+ Revert that last change, apparently it destroys everything in the world.
+
+ * bindings/js/DOMWrapperWorld.h:
+ * bindings/js/JSArrayBufferViewHelper.h:
+ (WebCore::toJSArrayBufferView):
+ * bindings/js/JSCSSRuleCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSCSSValueCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::setInlineCachedWrapper):
+ (WebCore::clearInlineCachedWrapper):
+ (WebCore::getCachedWrapper):
+ (WebCore::cacheWrapper):
+ (WebCore::wrap):
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::history):
+ (WebCore::JSDOMWindow::location):
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::location):
+ (WebCore::toJS):
+ * bindings/js/JSEventCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSHTMLCollectionCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSImageDataCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSSVGPathSegCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSStyleSheetCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSTrackCustom.cpp:
+ (WebCore::toJS):
+
2011-11-29 Tony Chang <t...@chromium.org>
flex-align:stretch + max-height needs to clamp to max-height and position appropriately
Modified: trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2011-11-29 19:44:07 UTC (rev 101401)
@@ -33,7 +33,7 @@
class JSDOMWrapper;
class ScriptController;
-typedef HashMap<void*, JSC::Weak<JSC::JSObject> > DOMObjectWrapperMap;
+typedef HashMap<void*, JSC::Weak<JSDOMWrapper> > DOMObjectWrapperMap;
typedef HashMap<StringImpl*, JSC::Weak<JSC::JSString> > JSStringCache;
class JSDOMWrapperOwner : public JSC::WeakHandleOwner {
Modified: trunk/Source/WebCore/bindings/js/JSArrayBufferViewHelper.h (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSArrayBufferViewHelper.h 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSArrayBufferViewHelper.h 2011-11-29 19:44:07 UTC (rev 101401)
@@ -168,7 +168,7 @@
if (!object)
return JSC::jsNull();
- if (JSC::JSObject* wrapper = getCachedWrapper(currentWorld(exec), object))
+ if (JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), object))
return wrapper;
exec->heap()->reportExtraMemoryCost(object->byteLength());
Modified: trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -63,7 +63,7 @@
if (!rule)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), rule);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), rule);
if (wrapper)
return wrapper;
Modified: trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -76,7 +76,7 @@
if (!value)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), value);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), value);
if (wrapper)
return wrapper;
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2011-11-29 19:44:07 UTC (rev 101401)
@@ -124,22 +124,22 @@
// Overload these functions to provide a fast path for wrapper access.
inline JSDOMWrapper* getInlineCachedWrapper(DOMWrapperWorld*, void*) { return 0; }
- inline bool setInlineCachedWrapper(DOMWrapperWorld*, void*, JSC::JSObject*) { return false; }
- inline bool clearInlineCachedWrapper(DOMWrapperWorld*, void*, JSC::JSObject*) { return false; }
+ inline bool setInlineCachedWrapper(DOMWrapperWorld*, void*, JSDOMWrapper*) { return false; }
+ inline bool clearInlineCachedWrapper(DOMWrapperWorld*, void*, JSDOMWrapper*) { return false; }
- template <typename DOMClass> inline JSC::JSObject* getCachedWrapper(DOMWrapperWorld* world, DOMClass* domObject)
+ template <typename DOMClass> inline JSDOMWrapper* getCachedWrapper(DOMWrapperWorld* world, DOMClass* domObject)
{
if (JSDOMWrapper* wrapper = getInlineCachedWrapper(world, domObject))
return wrapper;
return world->m_wrappers.get(domObject).get();
}
- template <typename DOMClass> inline void cacheWrapper(DOMWrapperWorld* world, DOMClass* domObject, JSC::JSObject* wrapper)
+ template <typename DOMClass> inline void cacheWrapper(DOMWrapperWorld* world, DOMClass* domObject, JSDOMWrapper* wrapper)
{
if (setInlineCachedWrapper(world, domObject, wrapper))
return;
ASSERT(!world->m_wrappers.contains(domObject));
- world->m_wrappers.set(domObject, JSC::Weak<JSC::JSObject>(*world->globalData(), wrapper, wrapperOwner(world, domObject), wrapperContext(world, domObject)));
+ world->m_wrappers.set(domObject, JSC::Weak<JSDOMWrapper>(*world->globalData(), wrapper, wrapperOwner(world, domObject), wrapperContext(world, domObject)));
}
template <typename DOMClass> inline void uncacheWrapper(DOMWrapperWorld* world, DOMClass* domObject, JSDOMWrapper* wrapper)
@@ -166,7 +166,7 @@
{
if (!domObject)
return JSC::jsNull();
- if (JSC::JSObject* wrapper = getCachedWrapper(currentWorld(exec), domObject))
+ if (JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), domObject))
return wrapper;
return createWrapper<WrapperClass>(exec, globalObject, domObject);
}
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -424,7 +424,7 @@
JSValue JSDOMWindow::history(ExecState* exec) const
{
History* history = impl()->history();
- if (JSObject* wrapper = getCachedWrapper(currentWorld(exec), history))
+ if (JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), history))
return wrapper;
JSDOMWindow* window = const_cast<JSDOMWindow*>(this);
@@ -436,7 +436,7 @@
JSValue JSDOMWindow::location(ExecState* exec) const
{
Location* location = impl()->location();
- if (JSObject* wrapper = getCachedWrapper(currentWorld(exec), location))
+ if (JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), location))
return wrapper;
JSDOMWindow* window = const_cast<JSDOMWindow*>(this);
Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -55,7 +55,7 @@
return jsNull();
Location* location = frame->domWindow()->location();
- if (JSObject* wrapper = getCachedWrapper(currentWorld(exec), location))
+ if (JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), location))
return wrapper;
JSLocation* jsLocation = JSLocation::create(getDOMStructure<JSLocation>(exec, globalObject()), globalObject(), location);
@@ -88,7 +88,7 @@
if (!document)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), document);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), document);
if (wrapper)
return wrapper;
Modified: trunk/Source/WebCore/bindings/js/JSEventCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSEventCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSEventCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -59,7 +59,7 @@
if (!event)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), event);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), event);
if (wrapper)
return wrapper;
Modified: trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -90,7 +90,7 @@
if (!collection)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), collection);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), collection);
if (wrapper)
return wrapper;
Modified: trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -41,7 +41,7 @@
if (!imageData)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), imageData);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), imageData);
if (wrapper)
return wrapper;
Modified: trunk/Source/WebCore/bindings/js/JSSVGPathSegCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSSVGPathSegCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSSVGPathSegCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -63,7 +63,7 @@
if (!object)
return jsNull();
- if (JSObject* wrapper = getCachedWrapper(currentWorld(exec), object))
+ if (JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), object))
return wrapper;
switch (object->pathSegType()) {
Modified: trunk/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -50,7 +50,7 @@
if (!styleSheet)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), styleSheet);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), styleSheet);
if (wrapper)
return wrapper;
Modified: trunk/Source/WebCore/bindings/js/JSTrackCustom.cpp (101400 => 101401)
--- trunk/Source/WebCore/bindings/js/JSTrackCustom.cpp 2011-11-29 19:31:09 UTC (rev 101400)
+++ trunk/Source/WebCore/bindings/js/JSTrackCustom.cpp 2011-11-29 19:44:07 UTC (rev 101401)
@@ -55,7 +55,7 @@
if (!track)
return jsNull();
- JSObject* wrapper = getCachedWrapper(currentWorld(exec), track);
+ JSDOMWrapper* wrapper = getCachedWrapper(currentWorld(exec), track);
if (wrapper)
return wrapper;
