Title: [154556] trunk/Source/WebCore
- Revision
- 154556
- Author
- [email protected]
- Date
- 2013-08-24 17:07:47 -0700 (Sat, 24 Aug 2013)
Log Message
Merge Document::viewportSize() logic into RenderView::viewportSize().
<https://webkit.org/b/120254>
Reviewed by Darin Adler.
RenderView can just ask FrameView (the viewport) about its size directly, no need for
a weirdly-placed method on Document.
* dom/Document.cpp:
* rendering/RenderView.cpp:
(WebCore::RenderView::viewportSize):
* rendering/RenderView.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154555 => 154556)
--- trunk/Source/WebCore/ChangeLog 2013-08-24 23:40:49 UTC (rev 154555)
+++ trunk/Source/WebCore/ChangeLog 2013-08-25 00:07:47 UTC (rev 154556)
@@ -1,5 +1,20 @@
2013-08-24 Andreas Kling <[email protected]>
+ Merge Document::viewportSize() logic into RenderView::viewportSize().
+ <https://webkit.org/b/120254>
+
+ Reviewed by Darin Adler.
+
+ RenderView can just ask FrameView (the viewport) about its size directly, no need for
+ a weirdly-placed method on Document.
+
+ * dom/Document.cpp:
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::viewportSize):
+ * rendering/RenderView.h:
+
+2013-08-24 Andreas Kling <[email protected]>
+
RenderObject::frame() should return a reference.
<https://webkit.org/b/120251>
Modified: trunk/Source/WebCore/dom/Document.cpp (154555 => 154556)
--- trunk/Source/WebCore/dom/Document.cpp 2013-08-24 23:40:49 UTC (rev 154555)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-08-25 00:07:47 UTC (rev 154556)
@@ -5631,13 +5631,6 @@
return loader;
}
-IntSize Document::viewportSize() const
-{
- if (!view())
- return IntSize();
- return view()->visibleContentRect(ScrollableArea::IncludeScrollbars).size();
-}
-
#if ENABLE(CSS_DEVICE_ADAPTATION)
IntSize Document::initialViewportSize() const
{
Modified: trunk/Source/WebCore/dom/Document.h (154555 => 154556)
--- trunk/Source/WebCore/dom/Document.h 2013-08-24 23:40:49 UTC (rev 154555)
+++ trunk/Source/WebCore/dom/Document.h 2013-08-25 00:07:47 UTC (rev 154556)
@@ -1121,8 +1121,6 @@
void suspendScheduledTasks(ActiveDOMObject::ReasonForSuspension);
void resumeScheduledTasks(ActiveDOMObject::ReasonForSuspension);
- IntSize viewportSize() const;
-
#if ENABLE(CSS_DEVICE_ADAPTATION)
IntSize initialViewportSize() const;
#endif
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (154555 => 154556)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2013-08-24 23:40:49 UTC (rev 154555)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2013-08-25 00:07:47 UTC (rev 154556)
@@ -1086,6 +1086,11 @@
return false;
}
+IntSize RenderView::viewportSize() const
+{
+ return frameView().visibleContentRect(ScrollableArea::IncludeScrollbars).size();
+}
+
void RenderView::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
{
if (result.innerNode())
Modified: trunk/Source/WebCore/rendering/RenderView.h (154555 => 154556)
--- trunk/Source/WebCore/rendering/RenderView.h 2013-08-24 23:40:49 UTC (rev 154555)
+++ trunk/Source/WebCore/rendering/RenderView.h 2013-08-25 00:07:47 UTC (rev 154556)
@@ -214,7 +214,7 @@
IntervalArena* intervalArena();
- IntSize viewportSize() const { return document()->viewportSize(); }
+ IntSize viewportSize() const;
void setRenderQuoteHead(RenderQuote* head) { m_renderQuoteHead = head; }
RenderQuote* renderQuoteHead() const { return m_renderQuoteHead; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
