[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[steveblock at google.com]

The following commit has been merged in the webkit-1.1 branch:
commit 5817945b638e25451e1378cf6387702b98c7c0a6
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 12:30:21 2010 +0000

    Unreviewed build fix.
    
    Adds missing include path for JSCBridge.h, added in http://trac.webkit.org/changeset/53620
    
    No new tests, build fix only.
    
    * GNUmakefile.am:
    * WebCore.pro:
    * WebCore.vcproj/WebCore.vcproj:
    * WebCore.xcodeproj/project.pbxproj:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5a496c..729b2ba 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,18 @@
 2010-01-21  Steve Block  <steveblock at google.com>
 
+        Unreviewed build fix.
+
+        Adds missing include path for JSCBridge.h, added in http://trac.webkit.org/changeset/53620
+
+        No new tests, build fix only.
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+
+2010-01-21  Steve Block  <steveblock at google.com>
+
         Reviewed by David Levin.
 
         Move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 2f8b89f..31950c4 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -15,6 +15,7 @@ webcore_cppflags += \
 	-I$(srcdir)/WebCore/bridge \
 	-I$(srcdir)/WebCore/bridge/c \
 	-I$(srcdir)/WebCore/bridge/jni/jsc \
+	-I$(srcdir)/WebCore/bridge/jsc \
 	-I$(srcdir)/WebCore/css \
 	-I$(srcdir)/WebCore/dom \
 	-I$(srcdir)/WebCore/dom/default \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index bd8e4eb..4ae6b47 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -157,6 +157,7 @@ INCLUDEPATH = \
     $$PWD/bindings/js \
     $$PWD/bridge \
     $$PWD/bridge/c \
+    $$PWD/bridge/jsc \
     $$PWD/css \
     $$PWD/dom \
     $$PWD/dom/default \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 93bd2ef..ea0564f 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -42497,6 +42497,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\bridge\jsc\BridgeJSC.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\bridge\jsc\BridgeJSC.h"
+				>
+			</File>
+			<File
 				RelativePath="..\bridge\NP_jsobject.cpp"
 				>
 			</File>
@@ -42529,10 +42537,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\bridge\Bridge.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\bridge\Bridge.h"
 				>
 			</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 2a0ad3e..4de9bb7 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1122,7 +1122,7 @@
 		59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */; };
 		59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */; };
 		59B597731108656B007159E8 /* BridgeJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59B597721108656B007159E8 /* BridgeJSC.cpp */; };
-		59B5977511086579007159E8 /* BridgeJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59B5977411086579007159E8 /* BridgeJSC.h */; };
+		59B5977511086579007159E8 /* BridgeJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59B5977411086579007159E8 /* BridgeJSC.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		59BC393F11054A1300FD85DB /* JavaStringJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59BC393E11054A1300FD85DB /* JavaStringJSC.h */; };
 		59C77F2A10545B3B00506104 /* GeolocationServiceMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */; };
 		59C77F2B10545B3B00506104 /* GeolocationServiceMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */; settings = {ATTRIBUTES = (Private, ); }; };

-- 
WebKit Debian packaging