Changeset 19198 for S60/trunk/WebCore

Timestamp:

01/28/07 10:17:19 (2 years ago)

Author:

brmorris

Message:

bujtas <zbujtas@gmail.com>

Rs'd by Brad
DESC: display fallback content in case of unsupported plugin.
http://bugs.webkit.org/show_bug.cgi?id=12426

fix: webkit should return null, if the plugin is not supported.

• bridge/WebCoreBridge.h:
• kwq/KWQKHTMLPart.cpp: (KWQKHTMLPart::createPart): (KWQKHTMLPart::createSoundstart):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/WebCoreBridge.h (modified) (1 diff)
• kwq/KWQKHTMLPart.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-26  bujtas  <zbujtas@gmail.com>
+
+        Rs'd by Brad
+        DESC: display fallback content in case of unsupported plugin.
+        http://bugs.webkit.org/show_bug.cgi?id=12426
+
+         fix: webkit should return null, if the plugin is not supported.
+
+        * bridge/WebCoreBridge.h:
+        * kwq/KWQKHTMLPart.cpp:
+        (KWQKHTMLPart::createPart):
+        (KWQKHTMLPart::createSoundstart):
+
 2007-01-26  bujtas  <zbujtas@gmail.com>
 

S60/trunk/WebCore/bridge/WebCoreBridge.h

@@ -664 +664 @@
                                                         const TDesC& aBaseUrl,
                                                         const TDesC& aMIMEType,
-                                                        TBool aCanLoadPluginContent) = 0;
+                                                        TBool aCanLoadPluginContent,
+                                                        TBool aHasFallbackContent ) = 0;
 
 //- (NSView *)viewForJavaAppletWithFrame(NSRect)frame

S60/trunk/WebCore/kwq/KWQKHTMLPart.cpp

@@ -905 +905 @@
 
         QObjectWidget* objectWidget = NULL;
-        objectWidget = new QObjectWidget(_bridge->Client().ViewForPluginWithURL(url.Des(),
-                                                                                *attributeNames,
-                                                                                *attributeValues,
-                                                                                d->m_doc->baseURL().Des(),
-                                                                                child.m_args.serviceType.Des(),
-                                                                                canLoadPluginContent));
+        MWebCoreObjectWidget* w = _bridge->Client().ViewForPluginWithURL(url.Des(), *attributeNames, *attributeValues, d->m_doc->baseURL().Des(),
+            child.m_args.serviceType.Des(), canLoadPluginContent, child.m_hasFallbackContent);
+        if (w) {
+            objectWidget = new QObjectWidget(w);
+        }
 
         delete attributeNames;
@@ -992 +991 @@
                                                                                 *attributeValues,
                                                                                 d->m_doc->baseURL().Des(),
-                                                                                soundstartType.Des(),ETrue));
+                                                                                soundstartType.Des(),ETrue, EFalse));
 
         delete attributeNames;