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

[dglazkov at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit ea49f92f11f67fcf4abf58aa7f749baf0e553646
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 22:43:55 2009 +0000

    2009-10-29  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Unreviewed, build fix.
    
            [Chromium] Include ComplextTextController into Chromium Mac project.
    
            * WebCore.gyp/WebCore.gyp: Added include rule for ComplextText* files.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e45e46c..0eac814 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-29  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Unreviewed, build fix.
+
+        [Chromium] Include ComplextTextController into Chromium Mac project.
+
+        * WebCore.gyp/WebCore.gyp: Added include rule for ComplextText* files.
+
 2009-10-29  Timothy Hatcher  <timothy at apple.com>
 
         Fix tabbing through element attributes in the Web Insector.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 055e3cb..e244045 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -891,6 +891,7 @@
 
             # Use native Mac font code from WebCore.
             ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
+            ['include', 'platform/graphics/mac/ComplexText[^/]*\\.(cpp|h)$'],
 
             # Cherry-pick some files that can't be included by broader regexps.
             # Some of these are used instead of Chromium platform files, see

-- 
WebKit Debian packaging