Respect the margins when creating frames.

Set the scroll mode to always off like we did before the rendered
frames patch and the other ports do now.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24764 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitQt/Api/qwebframe.cpp b/WebKitQt/Api/qwebframe.cpp
index 0f3f95dd1465076bbb59e58208444fe3ad8b439e..8409e73c839ee7be0ba9b9af3a3afe2d9fa232b2 100644 (file)
--- a/WebKitQt/Api/qwebframe.cpp
+++ b/WebKitQt/Api/qwebframe.cpp
@@ -75,7 +75,12 @@ void QWebFramePrivate::init(QWebFrame *qframe, WebCore::Page *page, QWebFrameDat
     frameView->deref();
     frameView->setQWebFrame(qframe);
     if (!frameData->allowsScrolling)
     frameView->deref();
     frameView->setQWebFrame(qframe);
     if (!frameData->allowsScrolling)

-        frameView->suppressScrollbars(true);
+        frameView->setScrollbarsMode(ScrollbarAlwaysOff);
+    if (frameData->marginWidth != -1)
+        frameView->setMarginWidth(frameData->marginWidth);
+    if (frameData->marginHeight != -1)
+        frameView->setMarginHeight(frameData->marginHeight);
+

     frame->setView(frameView.get());
     frame->init();
     eventHandler = frame->eventHandler();
     frame->setView(frameView.get());
     frame->init();
     eventHandler = frame->eventHandler();

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index e28bc57734b26ace259c4c6454a0aaf9aefc0d20..517ee05dfb729d4c7a8f72042f2d8a1435b7aeeb 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,14 @@
+2007-07-29  Adam Treat  <treat@kde.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Respect the margins when creating frames.
+        Set the scroll mode to always off like we did before the rendered
+        frames patch and the other ports do now.
+
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::init):
+

 2007-07-27  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Reviewed by Mark.
 2007-07-27  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Reviewed by Mark.