[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

hyatt at apple.com hyatt at apple.com
Mon Feb 21 00:39:28 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit fc83b3dc7987e7d5cdec1faabe84f6a2369ddd3c
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 20:20:36 2011 +0000

    https://bugs.webkit.org/show_bug.cgi?id=53520
    
    Reviewed by Darin Adler.
    
    Remove physical accessors from IntRect and FloatRect.
    
    * page/FrameView.cpp:
    (WebCore::FrameView::adjustPageHeightDeprecated):
    * platform/graphics/FloatRect.h:
    * platform/graphics/IntRect.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 332db74..2f45c20 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,18 @@
 2011-02-02  David Hyatt  <hyatt at apple.com>
 
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53520
+
+        Remove physical accessors from IntRect and FloatRect.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::adjustPageHeightDeprecated):
+        * platform/graphics/FloatRect.h:
+        * platform/graphics/IntRect.h:
+
+2011-02-02  David Hyatt  <hyatt at apple.com>
+
         Reviewed by Dan Bernstein.
 
         https://bugs.webkit.org/show_bug.cgi?id=53614
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 0e84dc0..454a184 100644
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -2338,7 +2338,7 @@ void FrameView::adjustPageHeightDeprecated(float *newBottom, float oldTop, float
         // Use a context with painting disabled.
         GraphicsContext context((PlatformGraphicsContext*)0);
         root->setTruncatedAt((int)floorf(oldBottom));
-        IntRect dirtyRect(0, (int)floorf(oldTop), root->rightLayoutOverflow(), (int)ceilf(oldBottom - oldTop));
+        IntRect dirtyRect(0, (int)floorf(oldTop), root->maxXLayoutOverflow(), (int)ceilf(oldBottom - oldTop));
         root->setPrintRect(dirtyRect);
         root->layer()->paint(&context, dirtyRect);
         *newBottom = root->bestTruncatedAt();
diff --git a/Source/WebCore/platform/graphics/FloatRect.h b/Source/WebCore/platform/graphics/FloatRect.h
index 307aa29..733f7cc 100644
--- a/Source/WebCore/platform/graphics/FloatRect.h
+++ b/Source/WebCore/platform/graphics/FloatRect.h
@@ -102,11 +102,6 @@ public:
 
     bool isEmpty() const { return m_size.isEmpty(); }
 
-    float left() const { return x(); }
-    float right() const { return x() + width(); }
-    float top() const { return y(); }
-    float bottom() const { return y() + height(); }
-
     FloatPoint center() const { return FloatPoint(x() + width() / 2, y() + height() / 2); }
 
     void move(const FloatSize& delta) { m_location += delta; } 
@@ -124,7 +119,6 @@ public:
         { return px >= x() && px <= maxX() && py >= y() && py <= maxY(); }
     bool contains(const FloatPoint& point) const { return contains(point.x(), point.y()); }
 
-
     void inflateX(float dx) {
         m_location.setX(m_location.x() - dx);
         m_size.setWidth(m_size.width() + dx + dx);
diff --git a/Source/WebCore/platform/graphics/IntRect.h b/Source/WebCore/platform/graphics/IntRect.h
index 0fcde0f..3a2433d 100644
--- a/Source/WebCore/platform/graphics/IntRect.h
+++ b/Source/WebCore/platform/graphics/IntRect.h
@@ -103,9 +103,6 @@ public:
 
     bool isEmpty() const { return m_size.isEmpty(); }
 
-    int right() const { return x() + width(); }
-    int bottom() const { return y() + height(); }
-
     // NOTE: The result is rounded to integer values, and thus may be not the exact
     // center point.
     IntPoint center() const { return IntPoint(x() + width() / 2, y() + height() / 2); }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list