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

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ad38a018299cdc4787953cca2d5c06e0ca56c60f
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 17:27:48 2010 +0000

    2010-02-23  Crystal Zhang  <haizhang at rim.com>
    
            Unreviewed build fix.
    
            Fix build error when enable plugin proxy: 'toRenderEmbeddedObject' identifier not found.
            As RenderEmbeddedObject inherits RenderPartObject and 'toRenderEmbeddedObject' belongs
            to former one.
    
            * html/HTMLMediaElement.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2f9aa84..50101dd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-23  Crystal Zhang  <haizhang at rim.com>
+
+        Unreviewed build fix.
+
+        Fix build error when enable plugin proxy: 'toRenderEmbeddedObject' identifier not found.
+        As RenderEmbeddedObject inherits RenderPartObject and 'toRenderEmbeddedObject' belongs
+        to former one.
+
+        * html/HTMLMediaElement.cpp:
+
 2010-02-23  Evan Martin  <evan at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index 12b93ef..a3e4a48 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -70,7 +70,7 @@
 #endif
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "RenderPartObject.h"
+#include "RenderEmbeddedObject.h"
 #include "Widget.h"
 #endif
 

-- 
WebKit Debian packaging