[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:59:59 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 892fffcb86efedc90d01bde1af65e785abbb8983
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 03:32:52 2002 +0000

    i        Logging changes.
            Changes to support correct i/frame behavior.
    
            Changes to support correct behavior is i/frame margins and
            scroll views.
    
            Changed method name.
            Support showing frames in render tree.  This isn't a direct reflection of the
            kde render tree.  I nest the render trees for each part.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e18934b..c1d7e64 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-04-01  Richard Williamson  <rjw at apple.com>
+
+        Changes to support correct behavior is i/frame margins and
+        scroll views.
+        
+	* src/kdelibs/khtml/html/html_baseimpl.h:
+	* src/kdelibs/khtml/rendering/render_body.cpp: (RenderBody::layout):
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::requestFrame):
+	* src/kwq/external.h:
+
 2002-04-01  Kenneth Kocienda  <kocienda at apple.com>
 
         The guts of the fix for this bug:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e18934b..c1d7e64 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-04-01  Richard Williamson  <rjw at apple.com>
+
+        Changes to support correct behavior is i/frame margins and
+        scroll views.
+        
+	* src/kdelibs/khtml/html/html_baseimpl.h:
+	* src/kdelibs/khtml/rendering/render_body.cpp: (RenderBody::layout):
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::requestFrame):
+	* src/kwq/external.h:
+
 2002-04-01  Kenneth Kocienda  <kocienda at apple.com>
 
         The guts of the fix for this bug:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e18934b..c1d7e64 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-04-01  Richard Williamson  <rjw at apple.com>
+
+        Changes to support correct behavior is i/frame margins and
+        scroll views.
+        
+	* src/kdelibs/khtml/html/html_baseimpl.h:
+	* src/kdelibs/khtml/rendering/render_body.cpp: (RenderBody::layout):
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::requestFrame):
+	* src/kwq/external.h:
+
 2002-04-01  Kenneth Kocienda  <kocienda at apple.com>
 
         The guts of the fix for this bug:
diff --git a/WebCore/khtml/html/html_baseimpl.h b/WebCore/khtml/html/html_baseimpl.h
index db37aba..fa1a843 100644
--- a/WebCore/khtml/html/html_baseimpl.h
+++ b/WebCore/khtml/html/html_baseimpl.h
@@ -95,6 +95,12 @@ public:
 
     DocumentImpl* contentDocument() const;
 
+#ifdef APPLE_CHANGES
+    QScrollView::ScrollBarMode scrollingMode() const { return scrolling; }
+    int getMarginWidth() const { return marginWidth; }
+    int getMarginHeight() const { return marginHeight; }
+#endif
+
 protected:
     DOMString url;
     DOMString name;
diff --git a/WebCore/khtml/rendering/render_body.cpp b/WebCore/khtml/rendering/render_body.cpp
index 29ca43b..5794879 100644
--- a/WebCore/khtml/rendering/render_body.cpp
+++ b/WebCore/khtml/rendering/render_body.cpp
@@ -90,15 +90,15 @@ void RenderBody::layout()
 {
     RenderFlow::layout();
 
+#ifndef APPLE_CHANGES
     if (!scrollbarsStyled)
     {
         if (root()->view())
         {
-#ifndef APPLE_CHANGES
             root()->view()->horizontalScrollBar()->setPalette(style()->palette());
             root()->view()->verticalScrollBar()->setPalette(style()->palette());
-#endif /* APPLE_CHANGES not defined */
         }
         scrollbarsStyled=true;
     }
+#endif /* APPLE_CHANGES not defined */
 }
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 58bb91c..bb9a84f 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -865,7 +865,8 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         IFWebFrame *newFrame;
         id <IFWebController> controller;
         NSString *urlString;
-        
+        HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(frame->element());
+                
         urlString = QSTRING_TO_NSSTRING (completeURL( url ).url() );
         childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
         
@@ -876,7 +877,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         
         oldDataSource = getDataSource();
         controller = [oldDataSource controller];
-        newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource];
+        newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource inScrollView: o->scrollingMode() == QScrollView::AlwaysOff ? NO : YES];
         if (newFrame == nil){
             // Controller return NO to location change, now what?
             return false;
@@ -887,6 +888,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         [newDataSource _setParent: oldDataSource];
         [newFrame setProvisionalDataSource: newDataSource];
     
+        KHTMLView *view = (KHTMLView *)[[newFrame view] _provisionalWidget];
+        view->setMarginWidth (o->getMarginWidth());
+        view->setMarginHeight (o->getMarginWidth());
+        
         [newFrame startLoading];
     }
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 58bb91c..bb9a84f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -865,7 +865,8 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         IFWebFrame *newFrame;
         id <IFWebController> controller;
         NSString *urlString;
-        
+        HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(frame->element());
+                
         urlString = QSTRING_TO_NSSTRING (completeURL( url ).url() );
         childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
         
@@ -876,7 +877,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         
         oldDataSource = getDataSource();
         controller = [oldDataSource controller];
-        newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource];
+        newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource inScrollView: o->scrollingMode() == QScrollView::AlwaysOff ? NO : YES];
         if (newFrame == nil){
             // Controller return NO to location change, now what?
             return false;
@@ -887,6 +888,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         [newDataSource _setParent: oldDataSource];
         [newFrame setProvisionalDataSource: newDataSource];
     
+        KHTMLView *view = (KHTMLView *)[[newFrame view] _provisionalWidget];
+        view->setMarginWidth (o->getMarginWidth());
+        view->setMarginHeight (o->getMarginWidth());
+        
         [newFrame startLoading];
     }
 
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index ffcbdb6..aad80ec 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -37,7 +37,7 @@
 @class IFLoadProgress;
 
 @protocol IFWebController
-- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource;
+- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource inScrollView: (BOOL)inScrollView;
 - (void)_receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
 @end
diff --git a/WebCore/src/kdelibs/khtml/html/html_baseimpl.h b/WebCore/src/kdelibs/khtml/html/html_baseimpl.h
index db37aba..fa1a843 100644
--- a/WebCore/src/kdelibs/khtml/html/html_baseimpl.h
+++ b/WebCore/src/kdelibs/khtml/html/html_baseimpl.h
@@ -95,6 +95,12 @@ public:
 
     DocumentImpl* contentDocument() const;
 
+#ifdef APPLE_CHANGES
+    QScrollView::ScrollBarMode scrollingMode() const { return scrolling; }
+    int getMarginWidth() const { return marginWidth; }
+    int getMarginHeight() const { return marginHeight; }
+#endif
+
 protected:
     DOMString url;
     DOMString name;
diff --git a/WebCore/src/kdelibs/khtml/rendering/render_body.cpp b/WebCore/src/kdelibs/khtml/rendering/render_body.cpp
index 29ca43b..5794879 100644
--- a/WebCore/src/kdelibs/khtml/rendering/render_body.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/render_body.cpp
@@ -90,15 +90,15 @@ void RenderBody::layout()
 {
     RenderFlow::layout();
 
+#ifndef APPLE_CHANGES
     if (!scrollbarsStyled)
     {
         if (root()->view())
         {
-#ifndef APPLE_CHANGES
             root()->view()->horizontalScrollBar()->setPalette(style()->palette());
             root()->view()->verticalScrollBar()->setPalette(style()->palette());
-#endif /* APPLE_CHANGES not defined */
         }
         scrollbarsStyled=true;
     }
+#endif /* APPLE_CHANGES not defined */
 }
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 58bb91c..bb9a84f 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -865,7 +865,8 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         IFWebFrame *newFrame;
         id <IFWebController> controller;
         NSString *urlString;
-        
+        HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(frame->element());
+                
         urlString = QSTRING_TO_NSSTRING (completeURL( url ).url() );
         childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
         
@@ -876,7 +877,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         
         oldDataSource = getDataSource();
         controller = [oldDataSource controller];
-        newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource];
+        newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource inScrollView: o->scrollingMode() == QScrollView::AlwaysOff ? NO : YES];
         if (newFrame == nil){
             // Controller return NO to location change, now what?
             return false;
@@ -887,6 +888,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         [newDataSource _setParent: oldDataSource];
         [newFrame setProvisionalDataSource: newDataSource];
     
+        KHTMLView *view = (KHTMLView *)[[newFrame view] _provisionalWidget];
+        view->setMarginWidth (o->getMarginWidth());
+        view->setMarginHeight (o->getMarginWidth());
+        
         [newFrame startLoading];
     }
 
diff --git a/WebCore/src/kwq/external.h b/WebCore/src/kwq/external.h
index ffcbdb6..aad80ec 100644
--- a/WebCore/src/kwq/external.h
+++ b/WebCore/src/kwq/external.h
@@ -37,7 +37,7 @@
 @class IFLoadProgress;
 
 @protocol IFWebController
-- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource;
+- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource inScrollView: (BOOL)inScrollView;
 - (void)_receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
 @end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 63ffd78..556f439 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-01  Richard Williamson  <rjw at apple.com>
+
+        Logging changes.
+        Changes to support correct i/frame behavior.
+    
+	* WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+	createFrameNamed:for:inParent:inScrollView:]):
+	* WebView.subproj/IFWebController.h:
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _timedLayout:]):
+	* WebView.subproj/IFWebViewPrivate.mm: (-[IFWebViewPrivate dealloc]),
+	(-[IFWebView _setupScrollers]):
+
 2002-04-01  John Sullivan  <sullivan at apple.com>
 
 	Added method for updating url, title, and/or displayTitle
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 63ffd78..556f439 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-04-01  Richard Williamson  <rjw at apple.com>
+
+        Logging changes.
+        Changes to support correct i/frame behavior.
+    
+	* WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+	createFrameNamed:for:inParent:inScrollView:]):
+	* WebView.subproj/IFWebController.h:
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _timedLayout:]):
+	* WebView.subproj/IFWebViewPrivate.mm: (-[IFWebViewPrivate dealloc]),
+	(-[IFWebView _setupScrollers]):
+
 2002-04-01  John Sullivan  <sullivan at apple.com>
 
 	Added method for updating url, title, and/or displayTitle
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 922ac26..a38fc1c 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -110,7 +110,7 @@
 }
 
 
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)childDataSource inParent: (IFWebDataSource *)parentDataSource
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)childDataSource inParent: (IFWebDataSource *)parentDataSource inScrollView: (BOOL)inScrollView
 {
     IFWebView *childView;
     IFWebFrame *newFrame;
@@ -125,10 +125,12 @@
     [childView _setController: self];
     [childDataSource _setController: self];
 
-    scrollView  = [[[IFDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
-    [scrollView setHasVerticalScroller: NO];
-    [scrollView setHasHorizontalScroller: NO];
-    [childView _setFrameScrollView: scrollView];
+    if (inScrollView == YES){
+        scrollView  = [[[IFDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
+        [scrollView setHasVerticalScroller: NO];
+        [scrollView setHasHorizontalScroller: NO];
+        [childView _setFrameScrollView: scrollView];
+    }
         
     return newFrame;
 }
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 639dd2b..8d5b408 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -190,7 +190,7 @@
 
 // Called when a data source needs to create a frame.  This method encapsulates the
 // specifics of creating and initializaing a view of the appropriate class.
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent;
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent inScrollView: (BOOL)inScrollView;
 
 - (IFWebFrame *)mainFrame;
 
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index ca90a47..b84e050 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -237,7 +237,7 @@ char *stateNames[6] = {
         [[self view] setNeedsDisplay: YES];
     }
     else {
-        WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s:  NOT performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+        WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s:  NOT performing timed layout (not needed), %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
     }
 }
 
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 489dadc..affc552 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -34,8 +34,8 @@
 
     [frameScrollView release];
 
-    if (widget)
-        delete widget;
+    //if (widget)
+    //    delete widget;
 
     [super dealloc];
 }
@@ -161,11 +161,13 @@
     BOOL scrollsVertically;
     BOOL scrollsHorizontally;
 
-    scrollsVertically = [self bounds].size.height > [[self _frameScrollView] frame].size.height;
-    scrollsHorizontally = [self bounds].size.width > [[self _frameScrollView] frame].size.width;
-
-    [[self _frameScrollView] setHasVerticalScroller: scrollsVertically];
-    [[self _frameScrollView] setHasHorizontalScroller: scrollsHorizontally];
+    if ([self _frameScrollView]){
+        scrollsVertically = [self bounds].size.height > [[self _frameScrollView] frame].size.height;
+        scrollsHorizontally = [self bounds].size.width > [[self _frameScrollView] frame].size.width;
+    
+        [[self _frameScrollView] setHasVerticalScroller: scrollsVertically];
+        [[self _frameScrollView] setHasHorizontalScroller: scrollsHorizontally];
+    }
 }
 
 
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 639dd2b..8d5b408 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -190,7 +190,7 @@
 
 // Called when a data source needs to create a frame.  This method encapsulates the
 // specifics of creating and initializaing a view of the appropriate class.
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent;
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent inScrollView: (BOOL)inScrollView;
 
 - (IFWebFrame *)mainFrame;
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index ca90a47..b84e050 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -237,7 +237,7 @@ char *stateNames[6] = {
         [[self view] setNeedsDisplay: YES];
     }
     else {
-        WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s:  NOT performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+        WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s:  NOT performing timed layout (not needed), %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
     }
 }
 
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 489dadc..affc552 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -34,8 +34,8 @@
 
     [frameScrollView release];
 
-    if (widget)
-        delete widget;
+    //if (widget)
+    //    delete widget;
 
     [super dealloc];
 }
@@ -161,11 +161,13 @@
     BOOL scrollsVertically;
     BOOL scrollsHorizontally;
 
-    scrollsVertically = [self bounds].size.height > [[self _frameScrollView] frame].size.height;
-    scrollsHorizontally = [self bounds].size.width > [[self _frameScrollView] frame].size.width;
-
-    [[self _frameScrollView] setHasVerticalScroller: scrollsVertically];
-    [[self _frameScrollView] setHasHorizontalScroller: scrollsHorizontally];
+    if ([self _frameScrollView]){
+        scrollsVertically = [self bounds].size.height > [[self _frameScrollView] frame].size.height;
+        scrollsHorizontally = [self bounds].size.width > [[self _frameScrollView] frame].size.width;
+    
+        [[self _frameScrollView] setHasVerticalScroller: scrollsVertically];
+        [[self _frameScrollView] setHasHorizontalScroller: scrollsHorizontally];
+    }
 }
 
 
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 639dd2b..8d5b408 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -190,7 +190,7 @@
 
 // Called when a data source needs to create a frame.  This method encapsulates the
 // specifics of creating and initializaing a view of the appropriate class.
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent;
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent inScrollView: (BOOL)inScrollView;
 
 - (IFWebFrame *)mainFrame;
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list