Title: [154620] trunk/Source
- Revision
- 154620
- Author
- [email protected]
- Date
- 2013-08-26 11:18:57 -0700 (Mon, 26 Aug 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154619 => 154620)
--- trunk/Source/WebCore/ChangeLog 2013-08-26 18:06:11 UTC (rev 154619)
+++ trunk/Source/WebCore/ChangeLog 2013-08-26 18:18:57 UTC (rev 154620)
@@ -1,3 +1,10 @@
+2013-08-26 Andreas Kling <[email protected]>
+
+ Unreviewed build fix.
+
+ * page/Page.cpp:
+ (WebCore::Page::setNeedsRecalcStyleInAllFrames):
+
2013-08-26 Brent Fulgham <[email protected]>
Unreviewed buid fix.
Modified: trunk/Source/WebCore/page/Page.cpp (154619 => 154620)
--- trunk/Source/WebCore/page/Page.cpp 2013-08-26 18:06:11 UTC (rev 154619)
+++ trunk/Source/WebCore/page/Page.cpp 2013-08-26 18:18:57 UTC (rev 154620)
@@ -482,7 +482,7 @@
{
for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
if (Document* document = frame->document())
- frame->document()->styleResolverChanged(DeferRecalcStyle);
+ document->styleResolverChanged(DeferRecalcStyle);
}
}
Modified: trunk/Source/WebKit/mac/ChangeLog (154619 => 154620)
--- trunk/Source/WebKit/mac/ChangeLog 2013-08-26 18:06:11 UTC (rev 154619)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-08-26 18:18:57 UTC (rev 154620)
@@ -1,5 +1,12 @@
2013-08-26 Andreas Kling <[email protected]>
+ Unreviewed build fix.
+
+ * WebView/WebFrame.mm:
+ (+[WebFrame _createMainFrameWithPage:frameName:frameView:]):
+
+2013-08-26 Andreas Kling <[email protected]>
+
WebCore: Let Page create the main Frame.
<https://webkit.org/b/119964>
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (154619 => 154620)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-08-26 18:06:11 UTC (rev 154619)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-08-26 18:18:57 UTC (rev 154620)
@@ -287,10 +287,10 @@
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]];
Modified: trunk/Source/WebKit2/ChangeLog (154619 => 154620)
--- trunk/Source/WebKit2/ChangeLog 2013-08-26 18:06:11 UTC (rev 154619)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-26 18:18:57 UTC (rev 154620)
@@ -1,3 +1,11 @@
+2013-08-26 Andreas Kling <[email protected]>
+
+ Unreviewed build fix.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::createWithCoreMainFrame):
+ (WebKit::WebFrame::createSubframe):
+
2013-08-26 Pratik Solanki <[email protected]>
PageGroup::groupSettings() should return a reference
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (154619 => 154620)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-08-26 18:06:11 UTC (rev 154619)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-08-26 18:18:57 UTC (rev 154620)
@@ -104,11 +104,11 @@
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 @@
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();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
