Changeset 21150 for S60/trunk/WebCore

Timestamp:

04/27/07 12:23:18 (21 months ago)

Author:

zbujtas

Message:

rathnasa, reviewed by zbujtas

DESC: Widget Menu API
http://bugs.webkit.org/show_bug.cgi?id=13494

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/ecma/kjs_window.cpp: (Window::get):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/ecma/kjs_window.cpp (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+rathnasa, reviewed by zbujtas
+ DESC: Widget Menu API
+ http://bugs.webkit.org/show_bug.cgi?id=13494
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/ecma/kjs_window.cpp:
+        (Window::get):      
+
 rathnasa, reviewed by zbujtas
  DESC: widet menu api implementation

S60/trunk/WebCore/khtml/ecma/kjs_window.cpp

@@ -823 +823 @@
 #ifdef RD_BROWSER_WIDGETS
     case _Widget:
-        return Value(m_widget ? m_widget :
-                   (const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec)));
+      if ( m_widget )
+        return Value(m_widget);
+      else
+        return ( ((const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec)))?
+          Value(const_cast<Window*>(this)->m_widget): Undefined());
     case Menu:
       if ( !m_widget )
-            (const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec));        
-      return Value(m_widgetMenu ? m_widgetMenu : 
-            const_cast<Window*>(this)->m_widgetMenu = KWQ(m_part)->createWidgetMenuObject(exec));
+        (const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec));        
+      if (!(const_cast<Window*>(this)->m_widget))
+        return Undefined();
+      if ( m_widgetMenu )
+        return Value(m_widgetMenu);
+      else
+        return ( ((const_cast<Window*>(this)->m_widgetMenu = KWQ(m_part)->createWidgetMenuObject(exec)))?
+          Value(const_cast<Window*>(this)->m_widgetMenu): Undefined());
     case MenuItem:
       if ( !m_widget )
-            (const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec));  
+        (const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec));        
+      if (!(const_cast<Window*>(this)->m_widget))
+        return Undefined();
       if ( !m_widgetMenu )
-            (const_cast<Window*>(this)->m_widgetMenu = KWQ(m_part)->createWidgetMenuObject(exec)); 
-      return Value(KWQ(m_part)->createWidgetMenuItemObject(exec));
+        (const_cast<Window*>(this)->m_widgetMenu = KWQ(m_part)->createWidgetMenuObject(exec));        
+      if (!(const_cast<Window*>(this)->m_widgetMenu))
+        return Undefined();
+      return KWQ(m_part)->createWidgetMenuItemObject(exec) ? Value(KWQ(m_part)->createWidgetMenuItemObject(exec)):Undefined();   
 #endif
     case Menubar: