Commit ccc2ab74 authored by akling@apple.com's avatar akling@apple.com

Unreviewed build fix.

Source/WebCore:

* page/Page.cpp:
(WebCore::Page::setNeedsRecalcStyleInAllFrames):

Source/WebKit/mac:

* WebView/WebFrame.mm:
(+[WebFrame _createMainFrameWithPage:frameName:frameView:]):

Source/WebKit2:

* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::createWithCoreMainFrame):
(WebKit::WebFrame::createSubframe):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154620 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cedcea8d
2013-08-26 Andreas Kling <akling@apple.com>
Unreviewed build fix.
* page/Page.cpp:
(WebCore::Page::setNeedsRecalcStyleInAllFrames):
2013-08-26 Brent Fulgham <bfulgham@apple.com>
Unreviewed buid fix.
......@@ -482,7 +482,7 @@ void Page::setNeedsRecalcStyleInAllFrames()
{
for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
if (Document* document = frame->document())
frame->document()->styleResolverChanged(DeferRecalcStyle);
document->styleResolverChanged(DeferRecalcStyle);
}
}
......
2013-08-26 Andreas Kling <akling@apple.com>
Unreviewed build fix.
* WebView/WebFrame.mm:
(+[WebFrame _createMainFrameWithPage:frameName:frameView:]):
2013-08-26 Andreas Kling <akling@apple.com>
WebCore: Let Page create the main Frame.
......
......@@ -287,10 +287,10 @@ WebView *getWebView(WebFrame *webFrame)
WebFrame *frame = [[self alloc] _initWithWebFrameView:frameView webView:webView];
frame->_private->coreFrame = page->mainFrame();
static_cast<WebFrameLoaderClient*>(page->mainFrame()->loader().client())->setWebFrame(frame);
static_cast<WebFrameLoaderClient&>(page->mainFrame()->loader().client()).setWebFrame(frame);
[frame release];
page->mainFrame()->tree()->setName(name);
page->mainFrame()->tree().setName(name);
page->mainFrame()->init();
[webView _setZoomMultiplier:[webView _realZoomMultiplier] isTextOnly:[webView _realZoomMultiplierIsTextOnly]];
......
2013-08-26 Andreas Kling <akling@apple.com>
Unreviewed build fix.
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::createWithCoreMainFrame):
(WebKit::WebFrame::createSubframe):
2013-08-26 Pratik Solanki <psolanki@apple.com>
PageGroup::groupSettings() should return a reference
......
......@@ -104,11 +104,11 @@ static uint64_t generateListenerID()
PassRefPtr<WebFrame> WebFrame::createWithCoreMainFrame(WebPage* page, WebCore::Frame* coreFrame)
{
RefPtr<WebFrame> frame = create(adoptPtr(static_cast<WebFrameLoaderClient*>(coreFrame->loader().client())));
RefPtr<WebFrame> frame = create(adoptPtr(static_cast<WebFrameLoaderClient*>(&coreFrame->loader().client())));
page->send(Messages::WebPageProxy::DidCreateMainFrame(frame->frameID()));
frame->m_coreFrame = coreFrame;
frame->m_coreFrame->tree()->setName(String());
frame->m_coreFrame->tree().setName(String());
frame->m_coreFrame->init();
return frame.release();
}
......@@ -120,10 +120,10 @@ PassRefPtr<WebFrame> WebFrame::createSubframe(WebPage* page, const String& frame
RefPtr<Frame> coreFrame = Frame::create(page->corePage(), ownerElement, frame->m_frameLoaderClient.get());
frame->m_coreFrame = coreFrame.get();
frame->m_coreFrame->tree()->setName(frameName);
frame->m_coreFrame->tree().setName(frameName);
if (ownerElement) {
ASSERT(ownerElement->document()->frame());
ownerElement->document()->frame()->tree()->appendChild(coreFrame.release());
ownerElement->document()->frame()->tree().appendChild(coreFrame.release());
}
frame->m_coreFrame->init();
return frame.release();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment