--- a/webengine/osswebengine/WebCore/rendering/RenderPartObject.cpp Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/WebCore/rendering/RenderPartObject.cpp Wed Sep 01 12:28:30 2010 +0100
@@ -42,7 +42,7 @@
#include "HTMLObjectElement.h"
#include "HTMLParamElement.h"
#include "KURL.h"
-#include "MimeTypeRegistry.h"
+#include "MIMETypeRegistry.h"
#include "Page.h"
#include "RenderView.h"
#include "Text.h"
@@ -208,6 +208,11 @@
// If we still don't have a type, try to map from a specific CLASSID to a type.
if (serviceType.isEmpty() && !o->m_classId.isEmpty())
mapClassIdToServiceType(o->m_classId, serviceType);
+#if PLATFORM(SYMBIAN)
+ //If there is no Type and Classid then return.
+ else if (serviceType.isEmpty() && o->m_classId.isEmpty() && !embed)
+ return;
+#endif
// If no URL and type, abort.
if (url.isEmpty() && serviceType.isEmpty())
@@ -361,7 +366,7 @@
int RenderPartObject::calcReplacedWidth() const
{
- if (m_widget && (m_widget->getView())->hasResized()) {
+ if (m_widget && m_widget->getView() && (m_widget->getView())->hasResized()) {
IntRect newRect = m_widget->frameGeometry();
int newWidth = newRect.width();
if (newWidth > 0) {
@@ -373,7 +378,7 @@
int RenderPartObject::calcReplacedHeight() const
{
- if (m_widget && (m_widget->getView())->hasResized()) {
+ if (m_widget && m_widget->getView() && (m_widget->getView())->hasResized()) {
IntRect newRect = m_widget->frameGeometry();
int newHeight = newRect.height();
if (newHeight > 0) {