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

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 44944b387c1b8f951376c2066e60440837a224de
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 22:13:31 2010 +0000

    2010-01-07  Simon Fraser  <simon.fraser at apple.com>
    
            Build fix.
    
            Add RenderEmbeddedObject.h/cpp to all the build systems.
    
            * Android.mk:
            * GNUmakefile.am:
            * WebCore.gypi:
            * WebCore.pro:
            * WebCore.vcproj/WebCore.vcproj:
            * WebCoreSources.bkl:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52949 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 9b45df0..bb87603 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -556,6 +556,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/RenderBoxModelObject.cpp \
 	rendering/RenderButton.cpp \
 	rendering/RenderCounter.cpp \
+	rendering/RenderEmbeddedObject.cpp \
 	rendering/RenderFieldset.cpp \
 	rendering/RenderFileUploadControl.cpp \
 	rendering/RenderFlexibleBox.cpp \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eb3d6a3..883a326 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07  Simon Fraser  <simon.fraser at apple.com>
+
+        Build fix.
+
+        Add RenderEmbeddedObject.h/cpp to all the build systems.
+
+        * Android.mk:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCoreSources.bkl:
+
 2010-01-07  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 67b671c..2a1d063 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1756,6 +1756,8 @@ webcore_sources += \
 	WebCore/rendering/RenderCounter.h \
 	WebCore/rendering/RenderDataGrid.cpp \
 	WebCore/rendering/RenderDataGrid.h \
+	WebCore/rendering/RenderEmbeddedObject.cpp \
+	WebCore/rendering/RenderEmbeddedObject.h \
 	WebCore/rendering/RenderFieldset.cpp \
 	WebCore/rendering/RenderFieldset.h \
 	WebCore/rendering/RenderFileUploadControl.cpp \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 34323fa..a5f5ea1 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2979,6 +2979,8 @@
             'rendering/RenderCounter.h',
             'rendering/RenderDataGrid.cpp',
             'rendering/RenderDataGrid.h',
+            'rendering/RenderEmbeddedObject.cpp',
+            'rendering/RenderEmbeddedObject.h',
             'rendering/RenderFieldset.cpp',
             'rendering/RenderFieldset.h',
             'rendering/RenderFileUploadControl.cpp',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 9dd75ea..e17d630 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1325,6 +1325,7 @@ SOURCES += \
     rendering/RenderButton.cpp \
     rendering/RenderCounter.cpp \
     rendering/RenderDataGrid.cpp \
+    rendering/RenderEmbeddedObject.cpp \
     rendering/RenderFieldset.cpp \
     rendering/RenderFileUploadControl.cpp \
     rendering/RenderFlexibleBox.cpp \
@@ -2050,6 +2051,7 @@ HEADERS += \
     rendering/RenderButton.h \
     rendering/RenderCounter.h \
     rendering/RenderDataGrid.h \
+    rendering/RenderEmbeddedObject.h \
     rendering/RenderFieldset.h \
     rendering/RenderFileUploadControl.h \
     rendering/RenderFlexibleBox.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index da42a80..91d2f6e 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -27129,6 +27129,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\rendering\RenderEmbeddedObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\rendering\RenderEmbeddedObject.h"
+				>
+			</File>
+			<File
 				RelativePath="..\rendering\RenderFieldset.cpp"
 				>
 			</File>
diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl
index d44e593..57d407f 100644
--- a/WebCore/WebCoreSources.bkl
+++ b/WebCore/WebCoreSources.bkl
@@ -979,6 +979,7 @@ This file contains the list of files needed to build WebCore.
         rendering/RenderButton.cpp
         rendering/RenderCounter.cpp
         rendering/RenderDataGrid.cpp
+        rendering/RenderEmbeddedObject.cpp
         rendering/RenderFieldset.cpp
         rendering/RenderFileUploadControl.cpp
         rendering/RenderFlexibleBox.cpp

-- 
WebKit Debian packaging