Title: [131305] trunk/Source/WebKit/blackberry
- Revision
- 131305
- Author
- toniki...@webkit.org
- Date
- 2012-10-15 08:53:26 -0700 (Mon, 15 Oct 2012)
Log Message
[BlackBerry] Clean up BackingStoreClient (part I)
https://bugs.webkit.org/show_bug.cgi?id=99327
Reviewed by Yong Li.
Patch by Antonio Gomes <ago...@rim.com>
Now that we won't use the BackingStoreClient code path to scroll inner frames at all
(instead we use AC layers!), we can remove all "!isMainFrame" code paths.
No behavior change, since the code path being removed was not in use.
* WebKitSupport/BackingStoreClient.cpp:
(BlackBerry::WebKit::BackingStoreClient::absoluteRect):
(BlackBerry::WebKit::BackingStoreClient::transformedActualVisibleSize):
(BlackBerry::WebKit::BackingStoreClient::viewportSize):
(BlackBerry::WebKit::BackingStoreClient::transformedViewportSize):
(BlackBerry::WebKit::BackingStoreClient::visibleContentsRect):
(BlackBerry::WebKit::BackingStoreClient::transformedVisibleContentsRect):
(BlackBerry::WebKit::BackingStoreClient::checkOriginOfCurrentScrollOperation):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (131304 => 131305)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-10-15 15:49:00 UTC (rev 131304)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-10-15 15:53:26 UTC (rev 131305)
@@ -1,3 +1,24 @@
+2012-10-15 Antonio Gomes <ago...@rim.com>
+
+ [BlackBerry] Clean up BackingStoreClient (part I)
+ https://bugs.webkit.org/show_bug.cgi?id=99327
+
+ Reviewed by Yong Li.
+
+ Now that we won't use the BackingStoreClient code path to scroll inner frames at all
+ (instead we use AC layers!), we can remove all "!isMainFrame" code paths.
+
+ No behavior change, since the code path being removed was not in use.
+
+ * WebKitSupport/BackingStoreClient.cpp:
+ (BlackBerry::WebKit::BackingStoreClient::absoluteRect):
+ (BlackBerry::WebKit::BackingStoreClient::transformedActualVisibleSize):
+ (BlackBerry::WebKit::BackingStoreClient::viewportSize):
+ (BlackBerry::WebKit::BackingStoreClient::transformedViewportSize):
+ (BlackBerry::WebKit::BackingStoreClient::visibleContentsRect):
+ (BlackBerry::WebKit::BackingStoreClient::transformedVisibleContentsRect):
+ (BlackBerry::WebKit::BackingStoreClient::checkOriginOfCurrentScrollOperation):
+
2012-10-13 Jakob Petsovits <jpetsov...@rim.com>
[BlackBerry] Fetch blit rects from a viewport accessor
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp (131304 => 131305)
--- trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp 2012-10-15 15:49:00 UTC (rev 131304)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp 2012-10-15 15:53:26 UTC (rev 131305)
@@ -126,15 +126,7 @@
{
IntRect rect = IntRect(IntPoint::zero(), viewportSize());
- if (!isMainFrame()) {
- // It is possible that the owner HTML element has been removed at this point,
- // especially when the frame is loading a _javascript_ URL.
- if (Element* elt = m_frame->ownerElement()) {
- if (RenderBox* obj = elt->renderBox())
- rect.move(obj->borderLeft() + obj->paddingLeft(), obj->borderTop() + obj->paddingTop());
- }
- }
-
+ // FIXME: Speed it up!
Frame* frame = m_frame;
while (frame) {
if (Element* element = static_cast<Element*>(frame->ownerElement())) {
@@ -221,10 +213,8 @@
IntSize BackingStoreClient::transformedActualVisibleSize() const
{
- if (isMainFrame())
- return m_webPage->d->transformedActualVisibleSize();
-
- return transformedViewportSize();
+ ASSERT(isMainFrame());
+ return m_webPage->d->transformedActualVisibleSize();
}
IntSize BackingStoreClient::viewportSize() const
@@ -233,10 +223,8 @@
if (!m_frame->view())
return IntSize();
- if (isMainFrame())
- return m_webPage->d->viewportSize();
-
- return m_frame->view()->visibleContentRect().size();
+ ASSERT(isMainFrame());
+ return m_webPage->d->viewportSize();
}
IntSize BackingStoreClient::transformedViewportSize() const
@@ -245,13 +233,8 @@
if (!m_frame->view())
return IntSize();
- if (isMainFrame())
- return m_webPage->d->transformedViewportSize();
-
- const IntSize untransformedViewportSize = m_frame->view()->visibleContentRect().size();
- const FloatPoint transformedBottomRight = m_webPage->d->m_transformationMatrix->mapPoint(
- FloatPoint(untransformedViewportSize.width(), untransformedViewportSize.height()));
- return IntSize(floorf(transformedBottomRight.x()), floorf(transformedBottomRight.y()));
+ ASSERT(isMainFrame());
+ return m_webPage->d->transformedViewportSize();
}
IntRect BackingStoreClient::visibleContentsRect() const
@@ -261,14 +244,7 @@
return IntRect();
IntRect visibleContentRect = m_frame->view()->visibleContentRect();
- if (isMainFrame())
- return visibleContentRect;
-
- IntPoint offset = absoluteLocation();
- visibleContentRect.move(offset.x(), offset.y());
- if (m_parent)
- visibleContentRect.intersect(m_parent->visibleContentsRect());
-
+ ASSERT(isMainFrame());
return visibleContentRect;
}
@@ -281,11 +257,7 @@
// viewport size as it is, which ensures that e.g. blitting operations
// always cover the whole widget/screen.
IntRect visibleContentsRect = IntRect(transformedScrollPosition(), transformedViewportSize());
- if (isMainFrame())
- return visibleContentsRect;
-
- IntPoint offset = transformedAbsoluteLocation();
- visibleContentsRect.move(offset.x(), offset.y());
+ ASSERT(isMainFrame());
return visibleContentsRect;
}
@@ -410,10 +382,8 @@
if (isScrollNotificationSuppressed())
return;
- if (isMainFrame())
- m_webPage->d->notifyTransformedScrollChanged();
- else
- m_backingStore->d->scrollChanged(transformedScrollPosition());
+ ASSERT(isMainFrame());
+ m_webPage->d->notifyTransformedScrollChanged();
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
