[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6561538a86de06832da9023335fbbc2ee1934df2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 18:45:39 2010 +0000

    2010-08-19  Vincent Scheib  <scheib at chromium.org>
    
            Reviewed by David Levin.
    
            Fixing previous Mac only build breakage with TilingDataTest.cpp
            https://bugs.webkit.org/show_bug.cgi?id=44223
    
            TilingDataTest.cpp included the wrong header, which had a compile
            option around the definition of the WebCore namespace. Without the
            namespace defined, error. Fixed by correctly including TilingData.h,
            which has no conditional compilation.
    
            * WebKit.gyp:
            * tests/TilingDataTest.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65688 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index efb849d..ede4767 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-19  Vincent Scheib  <scheib at chromium.org>
+
+        Reviewed by David Levin.
+
+        Fixing previous Mac only build breakage with TilingDataTest.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=44223
+
+        TilingDataTest.cpp included the wrong header, which had a compile 
+        option around the definition of the WebCore namespace. Without the 
+        namespace defined, error. Fixed by correctly including TilingData.h, 
+        which has no conditional compilation.
+
+        * WebKit.gyp:
+        * tests/TilingDataTest.cpp:
+
 2010-08-19  Jochen Eisinger  <jochen at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 16cb92a..ee2d15c 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -751,8 +751,7 @@
                         'tests/KeyboardTest.cpp',
                         'tests/KURLTest.cpp',
                         'tests/RunAllTests.cpp',
-                        # FIXME: This test is compile failing on mac.
-                        # 'tests/TilingDataTest.cpp',
+                        'tests/TilingDataTest.cpp',
                     ],
                     'conditions': [
                         ['OS=="win"', {
diff --git a/WebKit/chromium/tests/TilingDataTest.cpp b/WebKit/chromium/tests/TilingDataTest.cpp
index 463542b..867bd8d 100755
--- a/WebKit/chromium/tests/TilingDataTest.cpp
+++ b/WebKit/chromium/tests/TilingDataTest.cpp
@@ -30,7 +30,8 @@
 
 #include "config.h"
 
-#include "GLES2Texture.h"
+#include "TilingData.h"
+
 #include <gtest/gtest.h>
 
 using namespace WebCore;

-- 
WebKit Debian packaging