Diff
Modified: trunk/Source/WebCore/ChangeLog (155173 => 155174)
--- trunk/Source/WebCore/ChangeLog 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebCore/ChangeLog 2013-09-06 04:49:52 UTC (rev 155174)
@@ -1,3 +1,22 @@
+2013-09-05 Andreas Kling <[email protected]>
+
+ FrameView: Constructor should take Frame&.
+ <https://webkit.org/b/120824>
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.exp.in:
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::overlayPage):
+ * page/Frame.cpp:
+ (WebCore::Frame::createView):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::FrameView):
+ (WebCore::FrameView::create):
+ * page/FrameView.h:
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::dataChanged):
+
2013-09-05 Jinwoo Song <[email protected]>
Fix build warnings by unused parameter
Modified: trunk/Source/WebCore/WebCore.exp.in (155173 => 155174)
--- trunk/Source/WebCore/WebCore.exp.in 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-09-06 04:49:52 UTC (rev 155174)
@@ -1144,6 +1144,7 @@
__ZN7WebCore9FrameTree11appendChildEN3WTF10PassRefPtrINS_5FrameEEE
__ZN7WebCore9FrameTree7setNameERKN3WTF12AtomicStringE
__ZN7WebCore9FrameTree9clearNameEv
+__ZN7WebCore9FrameView6createERNS_5FrameE
__ZN7WebCore9FrameView11forceLayoutEb
__ZN7WebCore9FrameView12setMediaTypeERKN3WTF6StringE
__ZN7WebCore9FrameView13setNodeToDrawEPNS_4NodeE
@@ -1179,8 +1180,6 @@
__ZN7WebCore9FrameView37updateLayoutAndStyleIfNeededRecursiveEv
__ZN7WebCore9FrameView38scrollPositionChangedViaPlatformWidgetEv
__ZN7WebCore9FrameView39flushCompositingStateIncludingSubframesEv
-__ZN7WebCore9FrameView6createEPNS_5FrameE
-__ZN7WebCore9FrameView6createEPNS_5FrameERKNS_7IntSizeE
__ZN7WebCore9HTMLNames10listingTagE
__ZN7WebCore9HTMLNames11textareaTagE
__ZN7WebCore9HTMLNames12selectedAttrE
Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (155173 => 155174)
--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-09-06 04:49:52 UTC (rev 155174)
@@ -451,7 +451,7 @@
overlaySettings.setPluginsEnabled(false);
Frame& frame = m_overlayPage->mainFrame();
- frame.setView(FrameView::create(&frame));
+ frame.setView(FrameView::create(frame));
frame.init();
FrameLoader& loader = frame.loader();
frame.view()->setCanHaveScrollbars(false);
Modified: trunk/Source/WebCore/page/Frame.cpp (155173 => 155174)
--- trunk/Source/WebCore/page/Frame.cpp 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebCore/page/Frame.cpp 2013-09-06 04:49:52 UTC (rev 155174)
@@ -725,12 +725,12 @@
RefPtr<FrameView> frameView;
if (isMainFrame) {
- frameView = FrameView::create(this, viewportSize);
+ frameView = FrameView::create(*this, viewportSize);
frameView->setFixedLayoutSize(fixedLayoutSize);
frameView->setFixedVisibleContentRect(fixedVisibleContentRect);
frameView->setUseFixedLayout(useFixedLayout);
} else
- frameView = FrameView::create(this);
+ frameView = FrameView::create(*this);
frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock);
Modified: trunk/Source/WebCore/page/FrameView.cpp (155173 => 155174)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-09-06 04:49:52 UTC (rev 155174)
@@ -170,8 +170,8 @@
return Pagination::BottomToTopPaginated;
}
-FrameView::FrameView(Frame* frame)
- : m_frame(frame)
+FrameView::FrameView(Frame& frame)
+ : m_frame(&frame)
, m_canHaveScrollbars(true)
, m_layoutTimer(this, &FrameView::layoutTimerFired)
, m_layoutRoot(0)
@@ -214,14 +214,14 @@
}
}
-PassRefPtr<FrameView> FrameView::create(Frame* frame)
+PassRefPtr<FrameView> FrameView::create(Frame& frame)
{
RefPtr<FrameView> view = adoptRef(new FrameView(frame));
view->show();
return view.release();
}
-PassRefPtr<FrameView> FrameView::create(Frame* frame, const IntSize& initialSize)
+PassRefPtr<FrameView> FrameView::create(Frame& frame, const IntSize& initialSize)
{
RefPtr<FrameView> view = adoptRef(new FrameView(frame));
view->Widget::setFrameRect(IntRect(view->location(), initialSize));
Modified: trunk/Source/WebCore/page/FrameView.h (155173 => 155174)
--- trunk/Source/WebCore/page/FrameView.h 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebCore/page/FrameView.h 2013-09-06 04:49:52 UTC (rev 155174)
@@ -62,8 +62,8 @@
friend class RenderView;
friend class Internals;
- static PassRefPtr<FrameView> create(Frame*);
- static PassRefPtr<FrameView> create(Frame*, const IntSize& initialSize);
+ static PassRefPtr<FrameView> create(Frame&);
+ static PassRefPtr<FrameView> create(Frame&, const IntSize& initialSize);
virtual ~FrameView();
@@ -448,7 +448,7 @@
virtual bool isFlippedDocument() const;
private:
- explicit FrameView(Frame*);
+ explicit FrameView(Frame&);
void reset();
void init();
Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (155173 => 155174)
--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2013-09-06 04:49:52 UTC (rev 155174)
@@ -357,7 +357,7 @@
m_page->settings().setPluginsEnabled(false);
Frame& frame = m_page->mainFrame();
- frame.setView(FrameView::create(&frame));
+ frame.setView(FrameView::create(frame));
frame.init();
FrameLoader& loader = frame.loader();
loader.forceSandboxFlags(SandboxAll);
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (155173 => 155174)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2013-09-06 03:57:14 UTC (rev 155173)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2013-09-06 04:49:52 UTC (rev 155174)
@@ -1269,7 +1269,7 @@
if (isMainFrame && coreFrame->view())
coreFrame->view()->setParentVisible(false);
coreFrame->setView(0);
- RefPtr<FrameView> coreView = FrameView::create(coreFrame);
+ RefPtr<FrameView> coreView = FrameView::create(*coreFrame);
coreFrame->setView(coreView);
[m_webFrame.get() _updateBackgroundAndUpdatesWhileOffscreen];
