Title: [128207] branches/chromium/1229/Source/WebCore/bindings/v8
- Revision
- 128207
- Author
- [email protected]
- Date
- 2012-09-11 11:00:09 -0700 (Tue, 11 Sep 2012)
Log Message
fix for chromium 143937
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebCore/bindings/v8/V8Binding.cpp (128206 => 128207)
--- branches/chromium/1229/Source/WebCore/bindings/v8/V8Binding.cpp 2012-09-11 17:50:22 UTC (rev 128206)
+++ branches/chromium/1229/Source/WebCore/bindings/v8/V8Binding.cpp 2012-09-11 18:00:09 UTC (rev 128207)
@@ -482,7 +482,7 @@
v8::String* cachedV8String = m_stringCache.get(stringImpl);
if (cachedV8String) {
v8::Persistent<v8::String> handle(cachedV8String);
- if (!handle.IsNearDeath() && !handle.IsEmpty()) {
+ if (handle.IsWeak()) {
m_lastStringImpl = stringImpl;
m_lastV8String = handle;
return v8::Local<v8::String>::New(handle);
Modified: branches/chromium/1229/Source/WebCore/bindings/v8/V8Binding.h (128206 => 128207)
--- branches/chromium/1229/Source/WebCore/bindings/v8/V8Binding.h 2012-09-11 17:50:22 UTC (rev 128206)
+++ branches/chromium/1229/Source/WebCore/bindings/v8/V8Binding.h 2012-09-11 18:00:09 UTC (rev 128207)
@@ -60,11 +60,8 @@
v8::Local<v8::String> v8ExternalString(StringImpl* stringImpl, v8::Isolate* isolate)
{
- if (m_lastStringImpl.get() == stringImpl) {
- ASSERT(!m_lastV8String.IsNearDeath());
- ASSERT(!m_lastV8String.IsEmpty());
+ if (m_lastStringImpl.get() == stringImpl && m_lastV8String.IsWeak())
return v8::Local<v8::String>::New(m_lastV8String);
- }
return v8ExternalStringSlow(stringImpl, isolate);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
