Title: [151425] trunk/Source/WebCore
- Revision
- 151425
- Author
- rn...@webkit.org
- Date
- 2013-06-11 00:34:42 -0700 (Tue, 11 Jun 2013)
Log Message
Remove IntRect::pixelSnapped* and its enclosingRect since they are no longer used
https://bugs.webkit.org/show_bug.cgi?id=117494
Reviewed by Darin Adler.
Merge: https://chromium.googlesource.com/chromium/blink/+/9433dc00e882e2808ac1db3c1fd89090896d7b58
https://chromium.googlesource.com/chromium/blink/+/7beaa73aa099170cb2cad02c12c5e0a448b12c21
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::buildObjectForLayer):
* inspector/InspectorOverlay.cpp:
(WebCore::InspectorOverlay::update):
* platform/graphics/IntRect.h:
* rendering/RenderInline.cpp:
(WebCore::RenderInline::hitTestCulledInline):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::repaintUsingContainer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151424 => 151425)
--- trunk/Source/WebCore/ChangeLog 2013-06-11 07:10:00 UTC (rev 151424)
+++ trunk/Source/WebCore/ChangeLog 2013-06-11 07:34:42 UTC (rev 151425)
@@ -1,3 +1,23 @@
+2013-06-11 Ryosuke Niwa <rn...@webkit.org>
+
+ Remove IntRect::pixelSnapped* and its enclosingRect since they are no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=117494
+
+ Reviewed by Darin Adler.
+
+ Merge: https://chromium.googlesource.com/chromium/blink/+/9433dc00e882e2808ac1db3c1fd89090896d7b58
+ https://chromium.googlesource.com/chromium/blink/+/7beaa73aa099170cb2cad02c12c5e0a448b12c21
+
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::buildObjectForLayer):
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::update):
+ * platform/graphics/IntRect.h:
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::hitTestCulledInline):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::repaintUsingContainer):
+
2013-06-11 Sergio Villar Senin <svil...@igalia.com>
Autoclose braces and parentheses at the end of style sheet
Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (151424 => 151425)
--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2013-06-11 07:10:00 UTC (rev 151424)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2013-06-11 07:34:42 UTC (rev 151425)
@@ -178,7 +178,7 @@
RefPtr<TypeBuilder::LayerTree::Layer> layerObject = TypeBuilder::LayerTree::Layer::create()
.setLayerId(bind(renderLayer))
.setNodeId(idForNode(errorString, node))
- .setBounds(buildObjectForIntRect(enclosingIntRect(renderer->absoluteBoundingBoxRect())))
+ .setBounds(buildObjectForIntRect(renderer->absoluteBoundingBoxRect()))
.setMemory(backing->backingStoreMemoryEstimate())
.setCompositedBounds(buildObjectForIntRect(backing->compositedBounds()))
.setPaintCount(backing->graphicsLayer()->repaintCount());
Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (151424 => 151425)
--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-06-11 07:10:00 UTC (rev 151424)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-06-11 07:34:42 UTC (rev 151425)
@@ -284,8 +284,8 @@
return;
FrameView* overlayView = overlayPage()->mainFrame()->view();
- IntSize viewportSize = enclosingIntRect(view->visibleContentRect()).size();
- IntSize frameViewFullSize = enclosingIntRect(view->visibleContentRect(ScrollableArea::IncludeScrollbars)).size();
+ IntSize viewportSize = view->visibleContentRect().size();
+ IntSize frameViewFullSize = view->visibleContentRect(ScrollableArea::IncludeScrollbars).size();
IntSize size = m_size.isEmpty() ? frameViewFullSize : m_size;
overlayPage()->setPageScaleFactor(m_page->pageScaleFactor(), IntPoint());
size.scale(m_page->pageScaleFactor());
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (151424 => 151425)
--- trunk/Source/WebCore/platform/graphics/IntRect.h 2013-06-11 07:10:00 UTC (rev 151424)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2013-06-11 07:34:42 UTC (rev 151425)
@@ -95,17 +95,6 @@
int width() const { return m_size.width(); }
int height() const { return m_size.height(); }
- // FIXME: These methods are here only to ease the transition to sub-pixel layout. They should
- // be removed when we close http://webkit.org/b/60318
- int pixelSnappedX() const { return m_location.x(); }
- int pixelSnappedY() const { return m_location.y(); }
- int pixelSnappedMaxX() const { return x() + width(); }
- int pixelSnappedMaxY() const { return y() + height(); }
- int pixelSnappedWidth() const { return m_size.width(); }
- int pixelSnappedHeight() const { return m_size.height(); }
- IntPoint pixelSnappedLocation() const { return location(); }
- IntSize pixelSnappedSize() const { return size(); }
-
void setX(int x) { m_location.setX(x); }
void setY(int y) { m_location.setY(y); }
void setWidth(int width) { m_size.setWidth(width); }
@@ -250,13 +239,6 @@
return a.location() != b.location() || a.size() != b.size();
}
-// FIXME: This method is here only to ease the transition to sub-pixel layout. It should
-// be removed when we close http://webkit.org/b/60318
-inline IntRect enclosingIntRect(const IntRect& rect)
-{
- return rect;
-}
-
#if USE(CG)
IntRect enclosingIntRect(const CGRect&);
#endif
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (151424 => 151425)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2013-06-11 07:10:00 UTC (rev 151424)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2013-06-11 07:34:42 UTC (rev 151425)
@@ -803,7 +803,7 @@
// We can not use addNodeToRectBasedTestResult to determine if we fully enclose the hit-test area
// because it can only handle rectangular targets.
result.addNodeToRectBasedTestResult(node(), request, locationInContainer);
- return regionResult.contains(enclosingIntRect(tmpLocation.boundingBox()));
+ return regionResult.contains(tmpLocation.boundingBox());
}
return false;
}
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (151424 => 151425)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2013-06-11 07:10:00 UTC (rev 151424)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2013-06-11 07:34:42 UTC (rev 151425)
@@ -1340,10 +1340,7 @@
ASSERT(repaintContainer == v);
bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited();
if (!viewHasCompositedLayer || v->layer()->backing()->paintsIntoWindow()) {
- LayoutRect repaintRectangle = r;
- if (viewHasCompositedLayer && v->layer()->transform())
- repaintRectangle = enclosingIntRect(v->layer()->transform()->mapRect(r));
- v->repaintViewRectangle(repaintRectangle, immediate);
+ v->repaintViewRectangle(viewHasCompositedLayer && v->layer()->transform() ? v->layer()->transform()->mapRect(r) : r, immediate);
return;
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
