[haiku-webkit-commits] r308 - webkit/trunk/WebKit/haiku/WebCoreSupport
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Sat, 13 Mar 2010 11:27:03 +0000
Author: stippi
Date: Sat Mar 13 11:27:03 2010
New Revision: 308
URL: http://mmlr.dyndns.org/changeset/308
Log:
Do the "postCommitFrameViewSetup" for all frames, not just main frames. This
fixes cursors not working in sub-frames, since the top-level BView was not made
known to them.
Modified:
webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
Modified: webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp Tue Mar
9 21:19:59 2010 (r307)
+++ webkit/trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp Sat Mar
13 11:27:03 2010 (r308)
@@ -716,7 +716,7 @@
WebCore::ResourceError FrameLoaderClientHaiku::fileDoesNotExistError(const
WebCore::ResourceResponse& response)
{
notImplemented();
- return ResourceError(String(), WebKitErrorCannotShowURL,
+ return ResourceError(String(), WebKitErrorCannotShowURL,
response.url().string(), "File does not exist");
}
@@ -827,10 +827,6 @@
{
ASSERT(cachedFrame->view());
- Frame* frame = m_webFrame->Frame();
- if (frame != frame->page()->mainFrame())
- return;
-
// TODO: I guess we would have to restore platform data from the
cachedFrame here,
// data associated in savePlatformDataToCachedFrame().
@@ -851,10 +847,6 @@
frame->createView(size, backgroundColor, transparent, IntSize(), false);
- // We may need to do further manipulation on the FrameView if it was the
mainFrame
- if (frame != frame->page()->mainFrame())
- return;
-
postCommitFrameViewSetup(m_webFrame, frame->view(), true);
}
@@ -1015,8 +1007,6 @@
void FrameLoaderClientHaiku::postCommitFrameViewSetup(BWebFrame* frame,
FrameView* view, bool resetValues) const
{
- // This method can be used to do adjustments on the main frame, since those
- // are the only ones directly embedded into a BWebView.
view->setTopLevelPlatformWidget(m_webPage->WebView());
}
Other related posts:
- » [haiku-webkit-commits] r308 - webkit/trunk/WebKit/haiku/WebCoreSupport - webkit
