--- a/webengine/osswebengine/WebCore/loader/FrameLoader.cpp	Tue Feb 02 00:56:45 2010 +0200
+++ b/webengine/osswebengine/WebCore/loader/FrameLoader.cpp	Fri Mar 19 09:52:28 2010 +0200
@@ -226,7 +226,6 @@
     , m_wasUnloadEventEmitted(false)
     , m_isComplete(false)
     , m_isLoadingMainResource(false)
-    , m_mayLoadIconLater(false)    
     , m_cancellingWithLoadInProgress(false)
     , m_needsClear(false)
     , m_receivedData(false)
@@ -1044,17 +1043,11 @@
 
 void FrameLoader::iconLoadDecisionAvailable()
 {
+    if (!m_mayLoadIconLater)
+        return;
     LOG(IconDatabase, "FrameLoader %p was told a load decision is available for its icon", this);
-    if (m_mayLoadIconLater) {
-        // Notfification came from iconDataBase to load the icon
-        startIconLoader();
-        m_mayLoadIconLater = false;
-    } else {
-        // Icon was specified in <link> tag with rel="icon" or rel="shortcut icon" property
-        if(m_iconLoader)
-            m_iconLoader->stopLoading(); // cancel previous loading state
-        startIconLoader();
-    }
+    startIconLoader();
+    m_mayLoadIconLater = false;
 }
 
 void FrameLoader::startIconLoader()
@@ -1524,17 +1517,7 @@
         rect = anchorNode->getRect();
     }
     if (renderer)
-        {
-         if(!anchorNode)
-            {
-            renderer->enclosingLayer()->scrollRectToVisible(rect, RenderLayer::gAlignToEdgeIfNeeded, RenderLayer::gAlignToEdgeIfNeeded);
-            }
-         else
-             {
-             renderer->enclosingLayer()->scrollRectToVisible(rect, RenderLayer::gAlignToEdgeIfNeeded, RenderLayer::gAlignTopAlways);                         
-             }
-       
-        }
+        renderer->enclosingLayer()->scrollRectToVisible(rect, RenderLayer::gAlignToEdgeIfNeeded, RenderLayer::gAlignTopAlways);
 
     return true;
 }