[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e13393778e9f386bc785cee56cce409db4fe2fe9
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 16:17:49 2010 +0000

    2010-02-22  Steve Block  <steveblock at google.com>
    
            Reviewed by Nate Chapin.
    
            Shared worker types used in globalObjectPrototypeIsDOMWindow are not properly guarded
            https://bugs.webkit.org/show_bug.cgi?id=35238
    
            No new tests, build fix only.
    
            * bindings/v8/V8DOMWrapper.cpp:
            (WebCore::globalObjectPrototypeIsDOMWindow):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e352381..a3a06eb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-02-22  Steve Block  <steveblock at google.com>
 
+        Reviewed by Nate Chapin.
+
+        Shared worker types used in globalObjectPrototypeIsDOMWindow are not properly guarded
+        https://bugs.webkit.org/show_bug.cgi?id=35238
+
+        No new tests, build fix only.
+
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::globalObjectPrototypeIsDOMWindow):
+
+2010-02-22  Steve Block  <steveblock at google.com>
+
         Reviewed by Simon Fraser.
 
         Simplifies calculation of the transform in RenderLayer::paintLayer
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index 6bf6a2c..a057b9a 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -270,12 +270,14 @@ PassRefPtr<NodeFilter> V8DOMWrapper::wrapNativeNodeFilter(v8::Handle<v8::Value>
 
 static bool globalObjectPrototypeIsDOMWindow(v8::Handle<v8::Object> objectPrototype)
 {
+#if ENABLE(SHARED_WORKERS)
     // We can identify what type of context the global object is wrapping by looking at the
     // internal field count of its prototype. This assumes WorkerContexts and DOMWindows have different numbers
     // of internal fields, so a COMPILE_ASSERT is included to warn if this ever changes. DOMWindow has
     // traditionally had far more internal fields than any other class.
     COMPILE_ASSERT(V8DOMWindow::internalFieldCount != V8WorkerContext::internalFieldCount && V8DOMWindow::internalFieldCount != V8SharedWorkerContext::internalFieldCount,
         DOMWindowAndWorkerContextHaveUnequalFieldCounts);
+#endif
     return objectPrototype->InternalFieldCount() == V8DOMWindow::internalFieldCount;
 }
 

-- 
WebKit Debian packaging