diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/ChromeDOM.cpp
--- a/ginebra2/ChromeDOM.cpp	Fri May 14 15:40:36 2010 +0300
+++ b/ginebra2/ChromeDOM.cpp	Tue Jun 29 00:46:29 2010 -0400
@@ -1,21 +1,25 @@
 /*
 * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
 *
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
 *
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description: 
+* Description:
+* 
 *
 */
 
-
 #include <QtGui>
 #include <QWebElement>
 #include <QWebFrame>
@@ -27,20 +31,23 @@
 #include "ChromeWidget.h"
 #include "WebChromeSnippet.h"
 #include "WebChromeContainerSnippet.h"
-#include "GreenChromeSnippet.h"
-#include "BlueChromeSnippet.h"
-#include "ScrollZoomWidget.h"
-#include "ProgressSnippet.h"
-#include "TextEditItem.h"
+#include "PageSnippet.h"
+#include "PageItem.h"
+#include "ProgressBarItem.h"
+#include "ProgressBarSnippet.h"
 #include "ToolbarChromeItem.h"
 #include "ContentToolbarChromeItem.h"
-#include "iconsnippet.h"
-#include "iconwidget.h"
+#include "ContentToolbarSnippet.h"
+#include "WindowToolbarSnippet.h"
+#include "RecentUrlToolbarSnippet.h"
+#include "BookmarksToolbarSnippet.h"
+#include "SettingsToolbarSnippet.h"
 #include "ActionButton.h"
-#include "UrlSearchSnippet.h"
 #include "ActionButtonSnippet.h"
 #include "mostvisitedpageview.h"
 #include "mostvisitedsnippet.h"
+#include "UrlSearchSnippet.h"
+#include "EditorSnippet.h"
 
 #include <QDebug>
 
@@ -57,7 +64,7 @@
     m_renderer = m_chrome->renderer();
     m_renderer->clearRenderList();
   }
-  
+
   ChromeDOM::~ChromeDOM()
   {
   }
@@ -65,28 +72,28 @@
   QVariant ChromeDOM::evalInChromeContext(QString js){
     return m_page->mainFrame()->evaluateJavaScript(js);
   }
-  
+
   QWebElement ChromeDOM::getElementById(const QString &id)
   {
     return m_page->mainFrame()->documentElement().findFirst("#" + id);
   }
-  
+
   QRect ChromeDOM::getElementRect(const QString &id)
   {
     return getElementById(id).geometry();
   }
-  
+
   QSize ChromeDOM::getElementSize(const QString &id)
   {
     QRect rect = getElementRect(id);
     return QSize(rect.width(), rect.height());
   }
-  
+
   QString ChromeDOM::getElementAttribute(const QString &id, const QString &attribute)
   {
     return getElementById(id).attribute(attribute);
   }
-  
+
   //Get the cacheable script element. Only one is allowed so get the first one.
   /*QString ChromeDOM::getCacheableScript()
   {
@@ -96,112 +103,134 @@
   */
 
   //Get a list of cached handlers for a snippet
-  
+
   QList<CachedHandler> ChromeDOM::getCachedHandlers(const QString &elementId, const QRectF & ownerArea)
   {
     QWebElement snippet = getElementById(elementId);
     QList <QWebElement> controls =  snippet.findAll(".GinebraCached").toList();
     QList <CachedHandler> handlers;
-    for(int i = 0; i < controls.size(); i++){
+    for (int i = 0; i < controls.size(); i++){
       QWebElement elem = controls.at(i);
       //Element rectangle relative to snippet, so we can handle mouse events relative to snippet
       //qDebug() << "====> Owner X: " << ownerArea.x() << " Owner Width: " << ownerArea.width() << " Elem X: " << elem.geometry().x() << " Elem Width: " << elem.geometry().width();
-      QRectF elemRect(elem.geometry().x() - ownerArea.x(), elem.geometry().y() - ownerArea.y(), elem.geometry().width(), elem.geometry().height()); 
+      QRectF elemRect(elem.geometry().x() - ownerArea.x(), elem.geometry().y() - ownerArea.y(), elem.geometry().width(), elem.geometry().height());
       //NB: For now we handle only onclick from cache. Should add at least long-press too.
       CachedHandler handler(elem.attribute("id"), elem.attribute("data-GinebraOnClick"), elemRect, m_chrome, elem.attribute("data-GinebraTargetView"));
       //qDebug() << "Cached handler" << handler.elementId() << ": "  << handler.script() << ": "  << handler.rect();
       handlers.append(handler);
     }
-    return handlers;  
+    return handlers;
+  }
+  
+
+//TODO: Get rid of rectangle argument to snippets. This is redundant with the element argument!!
+//TODO: Rewrite using function table
+  
+  ChromeSnippet * ChromeDOM::nativeSnippetForClassName(const QString & className, const QString elementId,  QWebElement element)
+  {
+      QRectF rect = element.geometry();
+      
+      if (className == "ContentToolbar") {
+          return ContentToolbarSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "WindowToolbar") {
+          return WindowToolbarSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "RecentUrlToolbar") {
+          return RecentUrlToolbarSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "BookmarksToolbar") {
+          return BookmarksToolbarSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "SettingsToolbar") {
+          return SettingsToolbarSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "MostVisitedPagesWidget") {
+          return MostVisitedSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "ActionButton") {
+          return ActionButtonSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "PageSnippet") {
+          return PageSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "UrlSearchSnippet") {
+          return GUrlSearchSnippet::instance(elementId, m_chrome, element);
+      }
+      else if (className == "TextEditSnippet") {
+          return EditorSnippet::instance(elementId, m_chrome, element);
+      }
+      else {
+          ChromeSnippet* result = new ChromeSnippet(elementId, m_chrome, 0, element);
+          result->setChromeWidget(new QGraphicsWidget());
+          return result;
+      }
   }
   
   ChromeSnippet *ChromeDOM::getSnippet(const QString &docElementId, QGraphicsItem* parent) {
-    
-    ChromeSnippet * result = 0;
+    Q_UNUSED(parent)
+
+    ChromeSnippet * snippet = 0;
     QWebElement doc = m_page->mainFrame()->documentElement();
     QWebElement element = doc.findFirst("#" + docElementId);
-    QRect rect = getElementRect(docElementId);
+    QRect rect = element.geometry();
+    //TODO: This may not be accurate since final heights may not have been computed at this point!!
     m_height += rect.height();
-    //m_bytes += rect.width() * rect.height() * 3; //Calculate total rendered area at 24 bit depth
-    //qDebug() << "Chrome total rects at 24 bits: " << m_bytes;
-    //qDebug() << "Snippet: ID: " << docElementId << " Owner Area: " << rect << " Element Rect: " << element.geometry();
-    if(!rect.isNull()){
-      QString className = element.attribute("data-GinebraNativeClass", "__NO_CLASS__");
-      if(className == "__NO_CLASS__")
-	if(element.attribute("data-GinebraContainer", "false") == "true" ){
-          
-          QString type = element.attribute("data-GinebraItemType", "normal");
-          if (type == "contenttoolbar" ) {
-            ContentToolbarChromeItem * widget = new ContentToolbarChromeItem();
-            result = new WebChromeContainerSnippet(docElementId, m_chrome, rect, element, widget);
-            widget->setSnippet((WebChromeContainerSnippet*)result);
-          }
-          else if (type == "toolbar" ) {
-            ToolbarChromeItem * widget = new ToolbarChromeItem();
-            result = new WebChromeContainerSnippet(docElementId, m_chrome, rect, element, widget);
-            widget->setSnippet((WebChromeContainerSnippet*)result);
-          }
-          else {
-            result = new WebChromeContainerSnippet(docElementId, m_chrome, rect, element, new QGraphicsWidget());
-          }
-	}
-	else {
-	  result = new WebChromeSnippet(docElementId, m_chrome, rect, element);
-	  m_renderer->addRenderItem((static_cast<WebChromeSnippet*>(result))->item());
+    
+    //    qDebug() << "Snippet: ID: " << docElementId << " Owner Area: " << rect << " Element Rect: " << element.geometry();
+  
+    if (!rect.isNull()) {
+        QString className = element.attribute("data-GinebraNativeClass", "__NO_CLASS__");
+        if (className == "__NO_CLASS__") {
+            if (element.attribute("data-GinebraContainer", "false") == "true") {
+                snippet = new WebChromeContainerSnippet(docElementId, m_chrome, element);
+                snippet->setChromeWidget(new ChromeItem(snippet));
+            }
+            else {
+                snippet = new WebChromeSnippet(docElementId, m_chrome, element);
+                m_renderer->addRenderItem((static_cast<WebChromeSnippet*> (snippet))->item());
+            }
         }
-      else {
-	QGraphicsWidget * w = 0; 
-    if (className == "IconSnippet") {
-        result = new IconSnippet(docElementId, m_chrome, 0, element);
-        w = new IconWidget(result);
-    } else if (className == "MostVisitedPagesWidget") {
-        result = new MostVisitedSnippet(docElementId,m_chrome,0,element);
-        MostVisitedPagesWidget* mostVisited;
-        mostVisited = new MostVisitedPagesWidget(result,m_chrome);
-        mostVisited->hide();
-        w = mostVisited;
-    } else if (className == "ActionButton") {
-        result = new ActionButtonSnippet(docElementId, m_chrome, 0, element);
-        w = new ActionButton(result);
-    } else {
-	  //Chrome snippet takes ownership of w
-	  result = new ChromeSnippet(docElementId, m_chrome, 0, element);
-	  if (className == "ScrollZoomWidget")
-	    w = new ScrollZoomWidget(result);
-          else if (className == "UrlSearchSnippet")
-	    w = new UrlSearchSnippet(result, m_chrome);
-	  else if (className == "ProgressSnippet")
-	    w = new ProgressSnippet(result);
-	  else if (className == "TextEditSnippet"){
-	    w = new TextEditItem(result);
-	  }
-	  else { 
-	    w= new GreenChromeSnippet();
-	  }
-	}
-        result->setWidget(w);
-        //Have snippet deterimine its own size when in anchor layout
-        w->resize(rect.width(), rect.height());
-	w->setPreferredSize(rect.width(), rect.height());
-	w->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
-        //Have snippet determine its own location when NOT in anchor layout
-        w->setPos(rect.x(), rect.y());	
-      }
+        else {
+            snippet = nativeSnippetForClassName(className, docElementId, element);
+            //TODO: Is the following still needed?
+            QGraphicsWidget * widget = snippet->widget();
+            //Have snippet determine its own size when in anchor layout. Again, these will not
+            //necessarily be accurate at this point.
+            widget->resize(rect.width(), rect.height());
+            widget->setPreferredSize(rect.width(), rect.height());
+            widget->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
+            //Have snippet determine its own location when NOT in anchor layout
+            widget->setPos(rect.x(), rect.y());
+            
+        }
 
-      if(element.parent().attribute("class") == "GinebraSnippet") {
-	result->setParentId(element.parent().attribute("id"));
-      }
-      //Set auto-layout attributes
-      result->setAnchor(element.attribute("data-GinebraAnchor", "AnchorNone"), false);
-      result->setAnchorOffset(element.attribute("data-GinebraAnchorOffset", "0").toInt());
-      result->setInitiallyVisible(element.attribute("data-GinebraVisible", "false") == "true" );
-      result->setHidesContent( element.attribute("data-GinebraHidesContent", "false") == "true" );      
+        QWebElement parentElem;
+
+        if (!(parentElem = findChromeParent(element)).isNull()) {
+            snippet->setParentId(parentElem.attribute("id"));
+        }
+        //Set auto-layout attributes
+        snippet->setAnchor(element.attribute("data-GinebraAnchor", "AnchorNone"), false);
+        snippet->setAnchorOffset(element.attribute("data-GinebraAnchorOffset", "0").toInt());
+        snippet->setInitiallyVisible(element.attribute("data-GinebraVisible", "false") == "true");
+        snippet->setHidesContent(element.attribute("data-GinebraHidesContent", "false") == "true");
     }
-    return result;
+    return snippet;
   }
   
+  QWebElement ChromeDOM::findChromeParent(QWebElement element)
+  {
+    while(!(element = element.parent()).isNull()){
+      if (element.attribute("class") == "GinebraSnippet"){
+	return element;
+      }
+    }
+    return element;
+  }
+
   QList <QWebElement> ChromeDOM::getInitialElements()
-  { 
+  {
     m_renderer->clearRenderList();
     QWebElement test = getElementById("TestTableCell9");
     //qDebug() << "TEST ELEMENT:" << test.toPlainText();
@@ -212,6 +241,6 @@
 #else
     return doc.findAll(".GinebraSnippet").toList();
 #endif
-  } 
-  
+  }
+
 } // end of namespace GVA