Changeset 17843 in webkit

Timestamp:

Nov 18, 2006 11:25:56 AM (17 years ago)

Author:

zbujtas

Message:

2006-11-16 shkeller <​shaun.keller@nokia.com>

Reviewed by zalan.
DESC: render object of image type was wrongly typecast and move brace so changelog script works
​http://bugs.webkit.org/show_bug.cgi?id=11608

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/html/html_objectimpl.cpp: (HTMLEmbedElementImpl::isFocusable): (HTMLObjectElementImpl::getObjectInstance): (HTMLObjectElementImpl::isFocusable):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/html/html_objectimpl.cpp (modified) (4 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-16  shkeller  <shaun.keller@nokia.com>
+
+        Reviewed by zalan.
+        DESC: render object of image type was wrongly typecast and move brace so changelog script works
+        http://bugs.webkit.org/show_bug.cgi?id=11608
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLEmbedElementImpl::isFocusable):
+        (HTMLObjectElementImpl::getObjectInstance):
+        (HTMLObjectElementImpl::isFocusable):
+
 2006-11-13  ligman  <joseph.ligman@nokia.com>
 

S60/trunk/WebCore/khtml/html/html_objectimpl.cpp

@@ -54 +54 @@
 using namespace DOM;
 using namespace khtml;
+using namespace std;
 
 // -------------------------------------------------------------------------
@@ -513 +514 @@
         return false;
     else {
+      if (!strcmp(m_render->renderName(), "RenderPartObject")) {
         RenderPartObject* render = static_cast<RenderPartObject*>( m_render );
         return render->focusable();
+      } else {
+        return false;
+      }
     }
 }
@@ -587 +592 @@
             if (QWidget *widget = static_cast<RenderWidget *>(r)->widget()) {
 #if NOKIA_CHANGES                
-                if (MWebCoreWidget *view = widget->getView())  {
+                if (MWebCoreWidget *view = widget->getView())
 #else
-                if (NSView *view = widget->getView())  {
-#endif
+                if (NSView *view = widget->getView())
+#endif
+                {
                     // Call into the part (and over the bridge) to pull the Bindings::Instance
                     // from the guts of the plugin.
@@ -815 +821 @@
         return false;
     else {
+      if (!strcmp(m_render->renderName(), "RenderPartObject")) {
         RenderPartObject* render = static_cast<RenderPartObject*>( m_render );
         return render->focusable();
+      } else {
+        return false;
+      }
     }
 }