<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[24807] S60/branches/3.1m</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24807">24807</a></dd>
<dt>Author</dt> <dd>zbujtas</dd>
<dt>Date</dt> <dd>2007-08-01 12:52:45 -0700 (Wed, 01 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-07-31 yadavall <sriram.yadavalli@nokia.com>
Reviewed by Zalan Bujtas (zbujtas@gmail.com).
DESC: Fixes for Menu API</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60branches31mWebCoreChangeLog">S60/branches/3.1m/WebCore/ChangeLog</a></li>
<li><a href="#S60branches31mWebCorekhtmlecmakjs_windowcpp">S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.cpp</a></li>
<li><a href="#S60branches31mWebCorekhtmlecmakjs_windowluth">S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.lut.h</a></li>
<li><a href="#S60branches31mWebKitBrowserViewincWidgetExtensionh">S60/branches/3.1m/WebKit/BrowserView/inc/WidgetExtension.h</a></li>
<li><a href="#S60branches31mWebKitBrowserViewsrcWidgetExtensioncpp">S60/branches/3.1m/WebKit/BrowserView/src/WidgetExtension.cpp</a></li>
<li><a href="#S60branches31mWebKitChangeLog">S60/branches/3.1m/WebKit/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60branches31mWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebCore/ChangeLog (24806 => 24807)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebCore/ChangeLog 2007-08-01 19:47:39 UTC (rev 24806)
+++ S60/branches/3.1m/WebCore/ChangeLog 2007-08-01 19:52:45 UTC (rev 24807)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2007-07-31 yadavall <sriram.yadavalli@nokia.com>
+
+ Reviewed by Zalan Bujtas (zbujtas@gmail.com).
+ DESC: Fixes for Menu API
+ http://bugs.webkit.org/show_bug.cgi?id=
+
+ WARNING: NO TEST CASES ADDED OR CHANGED
+
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get):
+ * khtml/ecma/kjs_window.lut.h:
+ (KJS::):
+
</ins><span class="cx"> 2007-07-30 rathnasa <sornalatha.rathnasamy@nokia.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by zbujtas.
</span></span></pre></div>
<a id="S60branches31mWebCorekhtmlecmakjs_windowcpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.cpp (24806 => 24807)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.cpp 2007-08-01 19:47:39 UTC (rev 24806)
+++ S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.cpp 2007-08-01 19:52:45 UTC (rev 24807)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> frameElement Window::FrameElement DontDelete|ReadOnly
</span><span class="cx"> showModalDialog Window::ShowModalDialog DontDelete|Function 1
</span><span class="cx"> widget Window::_Widget DontDelete|Function 0
</span><del>- Menu Window::Menu DontDelete|ReadOnly
</del><ins>+ menu Window::Menu DontDelete|ReadOnly
</ins><span class="cx"> MenuItem Window::MenuItem DontDelete|ReadOnly
</span><span class="cx"> @end
</span><span class="cx"> */
</span><span class="lines">@@ -823,24 +823,12 @@
</span><span class="cx"> return ( ((const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec)))?
</span><span class="cx"> Value(const_cast<Window*>(this)->m_widget): Undefined());
</span><span class="cx"> case Menu:
</span><del>- if ( !m_widget )
- (const_cast<Window*>(this)->m_widget = KWQ(m_part)->createWidgetObject(exec));
- if (!(const_cast<Window*>(this)->m_widget))
- return Undefined();
</del><span class="cx"> if ( m_widgetMenu )
</span><span class="cx"> return Value(m_widgetMenu);
</span><span class="cx"> else
</span><span class="cx"> return ( ((const_cast<Window*>(this)->m_widgetMenu = KWQ(m_part)->createWidgetMenuObject(exec)))?
</span><span class="cx"> Value(const_cast<Window*>(this)->m_widgetMenu): Undefined());
</span><span class="cx"> case MenuItem:
</span><del>- if ( !m_widget )
- (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));
- if (!(const_cast<Window*>(this)->m_widgetMenu))
- return Undefined();
</del><span class="cx"> return KWQ(m_part)->createWidgetMenuItemObject(exec) ? Value(KWQ(m_part)->createWidgetMenuItemObject(exec)):Undefined();
</span><span class="cx"> case Menubar:
</span><span class="cx"> return Value(menubar(exec));
</span></span></pre></div>
<a id="S60branches31mWebCorekhtmlecmakjs_windowluth"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.lut.h (24806 => 24807)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.lut.h 2007-08-01 19:47:39 UTC (rev 24806)
+++ S60/branches/3.1m/WebCore/khtml/ecma/kjs_window.lut.h 2007-08-01 19:52:45 UTC (rev 24807)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-/* Automatically generated from kjs_window.cpp using create_hash_table. DO NOT EDIT ! */
</del><ins>+/* Automatically generated from kjs_window.cpp using y:\S60\mw\web\WebEngine\3.1m\JavaScriptCore\kjs\create_hash_table. DO NOT EDIT ! */
</ins><span class="cx">
</span><span class="cx"> namespace KJS {
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> { "Range", Window::Range, DontDelete, 0, &WindowTableEntries[91] },
</span><span class="cx"> { "status", Window::Status, DontDelete, 0, 0 },
</span><span class="cx"> { "onreset", Window::Onreset, DontDelete, 0, 0 },
</span><del>- { "Menu", Window::Menu, DontDelete|ReadOnly, 0, 0 },
</del><ins>+ { 0, 0, 0, 0, 0 },
</ins><span class="cx"> { "onselect", Window::Onselect, DontDelete, 0, 0 },
</span><span class="cx"> { 0, 0, 0, 0, 0 },
</span><span class="cx"> { "document", Window::Document, DontDelete|ReadOnly, 0, &WindowTableEntries[115] },
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> { "outerWidth", Window::OuterWidth, DontDelete|ReadOnly, 0, &WindowTableEntries[106] },
</span><span class="cx"> { "getSelection", Window::GetSelection, DontDelete|Function, 0, &WindowTableEntries[116] },
</span><span class="cx"> { 0, 0, 0, 0, 0 },
</span><del>- { "blur", Window::Blur, DontDelete|Function, 0, 0 },
</del><ins>+ { "blur", Window::Blur, DontDelete|Function, 0, &WindowTableEntries[128] },
</ins><span class="cx"> { "locationbar", Window::Locationbar, DontDelete, 0, &WindowTableEntries[107] },
</span><span class="cx"> { "DOMException", Window::DOMException, DontDelete, 0, &WindowTableEntries[96] },
</span><span class="cx"> { "MenuItem", Window::MenuItem, DontDelete|ReadOnly, 0, 0 },
</span><span class="lines">@@ -149,10 +149,11 @@
</span><span class="cx"> { "onmove", Window::Onmove, DontDelete, 0, 0 },
</span><span class="cx"> { "onsubmit", Window::Onsubmit, DontDelete, 0, 0 },
</span><span class="cx"> { "onbeforeunload", Window::Onbeforeunload, DontDelete, 0, 0 },
</span><del>- { "showModalDialog", Window::ShowModalDialog, DontDelete|Function, 1, 0 }
</del><ins>+ { "showModalDialog", Window::ShowModalDialog, DontDelete|Function, 1, 0 },
+ { "menu", Window::Menu, DontDelete|ReadOnly, 0, 0 }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-const struct HashTable WindowTable = { 2, 128, WindowTableEntries, 91 };
</del><ins>+const struct HashTable WindowTable = { 2, 129, WindowTableEntries, 91 };
</ins><span class="cx">
</span><span class="cx"> } // namespace
</span><span class="cx">
</span></span></pre></div>
<a id="S60branches31mWebKitBrowserViewincWidgetExtensionh"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserView/inc/WidgetExtension.h (24806 => 24807)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserView/inc/WidgetExtension.h 2007-08-01 19:47:39 UTC (rev 24806)
+++ S60/branches/3.1m/WebKit/BrowserView/inc/WidgetExtension.h 2007-08-01 19:52:45 UTC (rev 24807)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> * @param command ID of the parent menu item
</span><span class="cx"> * @return Error code
</span><span class="cx"> */
</span><del>- TInt AddOptionsMenuItem( const TDesC& aText, TInt aCmdId, TInt aParentCmdId, void* obj );
</del><ins>+ TInt AddOptionsMenuItem( const TDesC& aText, TInt aCmdId, TBool aDimmed, TInt aParentCmdId, void* obj );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Method SetRightSoftKeyLabel
</span><span class="lines">@@ -305,13 +305,6 @@
</span><span class="cx"> */
</span><span class="cx"> TDesC& GetWidgetBundleId() { return *iWidgetBundleId; }
</span><span class="cx">
</span><del>- /**
- * Method SetScrollBar
- * @since 3.2
- * @param TBool visible
- * @return void
- */
- void SetScrollBar( TBool aVisible );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Method SetNavigationEnabled
</span><span class="lines">@@ -610,7 +603,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Constructor
</span><span class="cx"> */
</span><del>- static CMenuItem* NewL( const TDesC16& aText, TInt aCmdId,
</del><ins>+ static CMenuItem* NewL( const TDesC16& aText, TInt aCmdId, TBool aDimmed = EFalse,
</ins><span class="cx"> CMenuItem* aParent = NULL, void* aObj = NULL );
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -627,7 +620,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * C++ constructor.
</span><span class="cx"> */
</span><del>- CMenuItem( const TDesC16& aText, TInt aCmdId, CMenuItem* aParent = NULL,
</del><ins>+ CMenuItem( const TDesC16& aText, TInt aCmdId, TBool aDimmed, CMenuItem* aParent = NULL,
</ins><span class="cx"> void* aObj = NULL );
</span><span class="cx">
</span><span class="cx"> public:
</span></span></pre></div>
<a id="S60branches31mWebKitBrowserViewsrcWidgetExtensioncpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserView/src/WidgetExtension.cpp (24806 => 24807)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserView/src/WidgetExtension.cpp 2007-08-01 19:47:39 UTC (rev 24806)
+++ S60/branches/3.1m/WebKit/BrowserView/src/WidgetExtension.cpp 2007-08-01 19:52:45 UTC (rev 24807)
</span><span class="lines">@@ -308,9 +308,6 @@
</span><span class="cx"> //
</span><span class="cx"> // ----------------------------------------------------------------------------
</span><span class="cx"> //
</span><del>-void CWidgetExtension::SetScrollBar( TBool /*aVisible*/ )
- {
- }
</del><span class="cx">
</span><span class="cx"> // ----------------------------------------------------------------------------
</span><span class="cx"> // CWidgetExtension::SetNavigationEnabled
</span><span class="lines">@@ -486,7 +483,7 @@
</span><span class="cx"> entry.parentCmdId = aNode->CmdId();
</span><span class="cx"> iCascadeArr.Append( entry );
</span><span class="cx">
</span><del>- aMenuPane.InsertMenuItemL( menuData, aMenuPane.NumberOfItemsInPane()-1 );
</del><ins>+ aMenuPane.InsertMenuItemL( menuData, Max(aMenuPane.NumberOfItemsInPane()-1,0) );
</ins><span class="cx"> aMenuPane.SetItemDimmed( aNode->CmdId()+KMenuItemCommandIdBase, aNode->Dimmed() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -666,7 +663,7 @@
</span><span class="cx"> // -----------------------------------------------------------------------------
</span><span class="cx"> //
</span><span class="cx"> TInt CWidgetExtension::AddOptionsMenuItem(
</span><del>- const TDesC& aText, TInt aCmdId, TInt aParentId, void* aObj )
</del><ins>+ const TDesC& aText, TInt aCmdId, TBool aDimmed, TInt aParentId, void* aObj )
</ins><span class="cx"> {
</span><span class="cx"> if ( !iMenuRoot )
</span><span class="cx"> {
</span><span class="lines">@@ -694,7 +691,7 @@
</span><span class="cx"> return KErrAlreadyExists;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- item = CMenuItem::NewL( aText, aCmdId, parent, aObj );
</del><ins>+ item = CMenuItem::NewL( aText, aCmdId, aDimmed, parent, aObj );
</ins><span class="cx"> return Append( parent, item );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1200,9 +1197,9 @@
</span><span class="cx"> // ----------------------------------------------------------------------------
</span><span class="cx"> //
</span><span class="cx"> CMenuItem* CMenuItem::NewL(
</span><del>- const TDesC16& aText, TInt aCmdId, CMenuItem* aParent, void* aObj )
</del><ins>+ const TDesC16& aText, TInt aCmdId, TBool aDimmed, CMenuItem* aParent, void* aObj )
</ins><span class="cx"> {
</span><del>- CMenuItem* self = new ( ELeave ) CMenuItem( aText, aCmdId, aParent, aObj );
</del><ins>+ CMenuItem* self = new ( ELeave ) CMenuItem( aText, aCmdId, aDimmed, aParent, aObj );
</ins><span class="cx"> CleanupStack::PushL( self );
</span><span class="cx"> self->ConstructL();
</span><span class="cx"> CleanupStack::Pop();
</span><span class="lines">@@ -1217,11 +1214,13 @@
</span><span class="cx"> // ----------------------------------------------------------------------------
</span><span class="cx"> //
</span><span class="cx"> CMenuItem::CMenuItem(
</span><del>- const TDesC16& aText, TInt aCmdId, CMenuItem* aParent, void* aObj )
- :iCmdId( aCmdId ), iParent( aParent ), iObj( aObj )
</del><ins>+ const TDesC16& aText, TInt aCmdId, TBool aDimmed, CMenuItem* aParent, void* aObj )
+ :iCmdId( aCmdId ),
+ iParent( aParent ),
+ iObj( aObj ),
+ iDimmed(aDimmed)
</ins><span class="cx"> {
</span><span class="cx"> iText = aText.Alloc();
</span><del>- iDimmed = EFalse;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ----------------------------------------------------------------------------
</span></span></pre></div>
<a id="S60branches31mWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/ChangeLog (24806 => 24807)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/ChangeLog 2007-08-01 19:47:39 UTC (rev 24806)
+++ S60/branches/3.1m/WebKit/ChangeLog 2007-08-01 19:52:45 UTC (rev 24807)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2007-07-31 yadavall <sriram.yadavalli@nokia.com>
+
+ Reviewed by Zalan Bujtas (zbujtas@gmail.com).
+ DESC: Fixes for Menu API
+ http://bugs.webkit.org/show_bug.cgi?id=14763
+
+ * BrowserView/inc/WidgetExtension.h:
+ * BrowserView/src/WidgetExtension.cpp:
+ (CWidgetExtension::AddMenuItem):
+ (CWidgetExtension::AddOptionsMenuItem):
+ (CMenuItem::NewL):
+ (iDimmed):
+
</ins><span class="cx"> 2007-07-19 hongzhao <hong.a.zhao@nokia.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Sachin.
</span></span></pre>
</div>
</div>
</body>
</html>