-
darin authored
* kjs/ustring.h: Since <sys/types.h> includes ushort and uint now, had to change the includes here to be compatible with that. WebFoundation: * WebFoundation.pbproj/project.pbxproj: Remove unused build phase. WebCore: * WebCore.pbproj/project.pbxproj: Add WebCoreFrame.mm, also export all the WebCore headers as Private so WebKit can see them. * khtml/khtmlview.cpp: (KHTMLView::drawContents): Remove APPLE_CHANGES since we don't use this function any more. * kwq/KWQDef.h: Since <sys/types.h> now includes ushort and uint, update code here to take that into account. * kwq/KWQKHTMLPartImpl.h: Added getView(). * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::getView): Added. Used by bridge. * kwq/qt/qpainter.h: * kwq/KWQPainter.mm: Simplify a bit, and remove some unused stuff. * kwq/WebCoreBridge.h: Add reapplyStyles, forceLayout, drawRect:. * kwq/WebCoreBridge.mm: (-[WebCoreBridge reapplyStyles]): Added. (-[WebCoreBridge forceLayout]): Added. (-[WebCoreBridge drawRect:]): Added. * kwq/WebCoreFrame.h: Make this a class as well as an interface. * kwq/WebCoreFrame.mm: Added. * WebCore.exp: Since WebCoreFrame is now a class as well as a protocol, export it so we can subclass. WebKit: About 1/3 of the remaining work to wean WebKit from its special relationship with WebCore onto explicit interfaces. * Misc.subproj/IFCache.mm: * WebView.subproj/IFDOMNode.mm: * WebView.subproj/IFRenderNode.mm: Mark imports from inside WebCore with #ifndef WEBKIT_INDEPENDENT_OF_WEBCORE. Once these are all gone, the task is done. * Plugins.subproj/IFPlugin.h: * WebCoreSupport.subproj/IFCookieAdapter.h: * WebCoreSupport.subproj/IFImageRenderer.h: * WebCoreSupport.subproj/IFImageRendererFactory.h: * WebCoreSupport.subproj/IFResourceURLHandleClient.m: * WebCoreSupport.subproj/IFTextRenderer.h: * WebCoreSupport.subproj/IFTextRendererFactory.h: * WebCoreSupport.subproj/IFWebCoreBridge.h: * WebCoreSupport.subproj/IFWebCoreViewFactory.h: Use #import <WebCore/> for getting at WebCore headers so we don't need to use -I. * WebCoreSupport.subproj/IFWebCoreBridge.mm: (-[IFWebCoreBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Call setRenderPart on the WebCoreFrame rather than on the IFWebFrame. * WebCoreSupport.subproj/IFWebCoreFrame.h: Subclass from the WebCoreFrame class. * WebCoreSupport.subproj/IFWebCoreFrame.m: (-[IFWebCoreFrame HTMLView]): Add a cast. (-[IFWebCoreFrame widget]): Remove overzealous assert. * WebKit.pbproj/project.pbxproj: Rearranged things a bit. Removed unneeded build phase. * WebView.subproj/IFDocument.h: * WebView.subproj/IFDynamicScrollBarsView.h: * WebView.subproj/IFWebController.h: * WebView.subproj/IFWebControllerPolicyHandler.h: Changed a few stray #include statements to #import statements. * WebView.subproj/IFHTMLView.mm: (-[IFHTMLView provisionalDataSourceCommitted:]): Move the logic for setting up the renderPart in here from IFWebView. (-[IFHTMLView reapplyStyles]): Use the bridge. (-[IFHTMLView layout]): Use the bridge. (-[IFHTMLView drawRect:]): Use the bridge. * WebView.subproj/IFHTMLViewPrivate.h: Remove _takeOwnershipOfWidget which is no longer needed. * WebView.subproj/IFHTMLViewPrivate.mm: (-[NSView _IF_stopIfPluginView]): Added. Use to clean up _reset a bit. (-[IFHTMLView _reset]): Use makeObjectsPerformSelector: for simplicity. * WebView.subproj/IFImageView.h: Remove unneeded IFWebDataSource declaration. * WebView.subproj/IFImageView.m: Just formatting tweaks. * WebView.subproj/IFWebControllerPrivate.mm: Removed unneeded import. * WebView.subproj/IFWebDataSource.mm: Removed unneeded import. * WebView.subproj/IFWebDataSourcePrivate.mm: Removed unneeded import. * WebView.subproj/IFWebFrame.mm: Removed unneeded import. * WebView.subproj/IFWebFramePrivate.h: Remove renderPart field and related declarations. * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFramePrivate dealloc]): No need to let go of renderPart any more. (-[IFWebFrame _transitionProvisionalToCommitted]): Move logic into IFHTMLView. * WebView.subproj/IFWebView.h: Be a bit more specific about the type of documentView. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1549 268f45cc-cd09-0410-ab3c-d52691b4dbfc
a03e8f33