[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[darin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit bf8527dbda46bc0c60f924c0de7e7d647215f019
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 23:28:07 2010 +0000

    2010-03-15  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            https://bugs.webkit.org/show_bug.cgi?id=36131
            Update include paths for chromium Rect, Point, and Size types.
    
            Update DEPS to pull latest chromium code that reflects the
            new location of these headers.
    
            * DEPS:
            * public/WebPoint.h:
            * public/WebRect.h:
            * public/WebSize.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56024 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b17ca71..16b6b1c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-03-15  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by David Levin.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36131
+        Update include paths for chromium Rect, Point, and Size types.
+
+        Update DEPS to pull latest chromium code that reflects the
+        new location of these headers.
+
+        * DEPS:
+        * public/WebPoint.h:
+        * public/WebRect.h:
+        * public/WebSize.h:
+
 2010-03-15  Marcus Bulach  <bulach at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 7244505..3390958 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -35,7 +35,7 @@ vars = {
   'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
 
   # Dependencies' revisions to use:
-  'chromium_rev': '38580',
+  'chromium_rev': '41621',
   'google-url_rev': '125',
   'gtest_rev': '359',
   'gyp_rev': '790',
diff --git a/WebKit/chromium/public/WebPoint.h b/WebKit/chromium/public/WebPoint.h
index d1abe02..20c52c2 100644
--- a/WebKit/chromium/public/WebPoint.h
+++ b/WebKit/chromium/public/WebPoint.h
@@ -36,7 +36,7 @@
 #if WEBKIT_IMPLEMENTATION
 #include "IntPoint.h"
 #else
-#include <base/gfx/rect.h>
+#include <gfx/point.h>
 #endif
 
 namespace WebKit {
diff --git a/WebKit/chromium/public/WebRect.h b/WebKit/chromium/public/WebRect.h
index ed5a7d1..30381d7 100644
--- a/WebKit/chromium/public/WebRect.h
+++ b/WebKit/chromium/public/WebRect.h
@@ -36,7 +36,7 @@
 #if WEBKIT_IMPLEMENTATION
 #include "IntRect.h"
 #else
-#include <base/gfx/rect.h>
+#include <gfx/rect.h>
 #endif
 
 namespace WebKit {
diff --git a/WebKit/chromium/public/WebSize.h b/WebKit/chromium/public/WebSize.h
index bb88633..a7159b2 100644
--- a/WebKit/chromium/public/WebSize.h
+++ b/WebKit/chromium/public/WebSize.h
@@ -36,7 +36,7 @@
 #if WEBKIT_IMPLEMENTATION
 #include "IntSize.h"
 #else
-#include <base/gfx/rect.h>
+#include <gfx/size.h>
 #endif
 
 namespace WebKit {

-- 
WebKit Debian packaging