[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ggaren at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit c7ea5896301b98776b6e59c73e655d51ab2d5b65
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 22:27:20 2010 +0000

    Build fix: avoid a name conflict by using the local 'structure' instead
    of the member 'structure()'.
    
    * bindings/js/JSDOMWindowBase.cpp:
    (WebCore::JSDOMWindowBase::JSDOMWindowBase):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 883a326..d6bf831 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-07  Geoffrey Garen  <ggaren at apple.com>
+
+        Build fix: avoid a name conflict by using the local 'structure' instead
+        of the member 'structure()'.
+
+        * bindings/js/JSDOMWindowBase.cpp:
+        (WebCore::JSDOMWindowBase::JSDOMWindowBase):
+
 2010-01-07  Simon Fraser  <simon.fraser at apple.com>
 
         Build fix.
diff --git a/WebCore/bindings/js/JSDOMWindowBase.cpp b/WebCore/bindings/js/JSDOMWindowBase.cpp
index f0c9279..9cf3de4 100644
--- a/WebCore/bindings/js/JSDOMWindowBase.cpp
+++ b/WebCore/bindings/js/JSDOMWindowBase.cpp
@@ -53,7 +53,7 @@ JSDOMWindowBase::JSDOMWindowBaseData::JSDOMWindowBaseData(PassRefPtr<DOMWindow>
 JSDOMWindowBase::JSDOMWindowBase(NonNullPassRefPtr<Structure> structure, PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell)
     : JSDOMGlobalObject(structure, new JSDOMWindowBaseData(window, shell), shell)
 {
-    structure()->disableSpecificFunctionTracking();
+    structure->disableSpecificFunctionTracking();
 
     GlobalPropertyInfo staticGlobals[] = {
         GlobalPropertyInfo(Identifier(globalExec(), "document"), jsNull(), DontDelete | ReadOnly),

-- 
WebKit Debian packaging