1 files changed, 13 insertions, 84 deletions

diff --git a/WebCore/page/qt/FrameQt.cpp b/WebCore/page/qt/FrameQt.cpp
index 7ae1dd9..1bbbff5 100644
--- a/WebCore/page/qt/FrameQt.cpp
+++ b/WebCore/page/qt/FrameQt.cpp
@@ -1,14 +1,4 @@
 /*
- * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
- * Copyright (C) 2006 Zack Rusin <zack@kde.org>
- * Copyright (C) 2006 George Staikos <staikos@kde.org>
- * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>
- * Copyright (C) 2006 Rob Buis <buis@kde.org>
- * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2007 Trolltech ASA
- *
- * All rights reserved.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -33,91 +23,30 @@
 
 #include "config.h"
 #include "Frame.h"
-
-#include "Element.h"
-#include "RenderObject.h"
-#include "RenderWidget.h"
-#include "RenderLayer.h"
-#include "Page.h"
-#include "Document.h"
-#include "HTMLElement.h"
-#include "DOMWindow.h"
-#include "FrameLoadRequest.h"
-#include "FrameLoaderClientQt.h"
-#include "DOMImplementation.h"
-#include "ResourceHandleInternal.h"
-#include "Document.h"
-#include "Settings.h"
-#include "Plugin.h"
-#include "FrameView.h"
 #include "FramePrivate.h"
-#include "GraphicsContext.h"
-#include "HTMLDocument.h"
-#include "ResourceHandle.h"
-#include "FrameLoader.h"
-#include "PlatformMouseEvent.h"
-#include "PlatformKeyboardEvent.h"
-#include "PlatformWheelEvent.h"
-#include "MouseEventWithHitTestResults.h"
-#include "SelectionController.h"
-#include "kjs_proxy.h"
-#include "TypingCommand.h"
-#include "JSLock.h"
-#include "kjs_window.h"
-#include "runtime_root.h"
-#include "runtime.h"
-#include <QScrollArea>
-#include "NotImplemented.h"
+#include "UserStyleSheetLoader.h"
 
 namespace WebCore {
 
-// FIXME: Turned this off to fix buildbot. This function be either deleted or used.
-#if 0
-static void doScroll(const RenderObject* r, bool isHorizontal, int multiplier)
-{
-    // FIXME: The scrolling done here should be done in the default handlers
-    // of the elements rather than here in the part.
-    if (!r)
-        return;
-
-    //broken since it calls scroll on scrollbars
-    //and we have none now
-    //r->scroll(direction, KWQScrollWheel, multiplier);
-    if (!r->layer())
-        return;
-
-    int x = r->layer()->scrollXOffset();
-    int y = r->layer()->scrollYOffset();
-    if (isHorizontal)
-        x += multiplier;
-    else
-        y += multiplier;
-
-    r->layer()->scrollToOffset(x, y, true, true);
-}
-#endif
-
-KJS::Bindings::Instance* Frame::createScriptInstanceForWidget(WebCore::Widget* widget)
+DragImageRef Frame::dragImageForSelection() 
 {
-    QWidget* nativeWidget = widget->nativeWidget();
-    if (!nativeWidget)
-        return 0;
-    return KJS::Bindings::Instance::createBindingForLanguageInstance(KJS::Bindings::Instance::QtLanguage,
-                                                                     nativeWidget,
-                                                                     bindingRootObject());
+    return 0;
 }
 
-void Frame::clearPlatformScriptObjects()
+void Frame::setUserStyleSheetLocation(const KURL& url)
 {
+    delete d->m_userStyleSheetLoader;
+    d->m_userStyleSheetLoader = 0;
+    if (d->m_doc && d->m_doc->docLoader())
+        d->m_userStyleSheetLoader = new UserStyleSheetLoader(d->m_doc, url.string());
 }
 
-DragImageRef Frame::dragImageForSelection() 
-{
-    return 0;
-}
-    
-void Frame::dashboardRegionsChanged()
+void Frame::setUserStyleSheet(const String& styleSheet)
 {
+    delete d->m_userStyleSheetLoader;
+    d->m_userStyleSheetLoader = 0;
+    if (d->m_doc)
+        d->m_doc->setUserStyleSheet(styleSheet);
 }
 
 }