equal
deleted
inserted
replaced
159 m_webFrame->frameView()->topView()->setRedirectWithLockedHistory(true); |
159 m_webFrame->frameView()->topView()->setRedirectWithLockedHistory(true); |
160 if (docLoader->isLoadingMainResource()&& |
160 if (docLoader->isLoadingMainResource()&& |
161 core(m_webFrame)->loader()->isLoadingMainFrame() && |
161 core(m_webFrame)->loader()->isLoadingMainFrame() && |
162 FrameLoadTypeStandard == core(m_webFrame)->loader()->loadType()){ |
162 FrameLoadTypeStandard == core(m_webFrame)->loader()->loadType()){ |
163 m_webFrame->frameView()->topView()->resetZoomLevel(); |
163 m_webFrame->frameView()->topView()->resetZoomLevel(); |
|
164 m_webFrame->frameView()->topView()->resetJsTimers(); |
164 } |
165 } |
165 |
166 |
166 if (!core(m_webFrame)->ownerElement()) { |
167 if (!core(m_webFrame)->ownerElement()) { |
167 brctl(m_webFrame)->settings()->setNavigationType((brctl(m_webFrame)->capabilities()&TBrCtlDefs::ECapabilityCursorNavigation) ? SettingsContainer::NavigationTypeCursor : SettingsContainer::NavigationTypeTabbed); |
168 brctl(m_webFrame)->settings()->setNavigationType((brctl(m_webFrame)->capabilities()&TBrCtlDefs::ECapabilityCursorNavigation) ? SettingsContainer::NavigationTypeCursor : SettingsContainer::NavigationTypeTabbed); |
168 StaticObjectsContainer::instance()->webCursor()->cursorUpdate(true); |
169 StaticObjectsContainer::instance()->webCursor()->cursorUpdate(true); |