Changeset 107305 in webkit

Timestamp:

Feb 9, 2012, 4:31:12 PM (15 years ago)

Author:

eae@chromium.org

Message:

Remove unnecessary type conversions.

Location:

branches/subpixellayout/Source/WebCore

Files:

• fileapi/BlobURL.cpp (modified) (3 diffs)
• fileapi/BlobURL.h (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)
• page/FrameView.h (modified) (2 diffs)
• page/mac/FrameMac.mm (modified) (1 diff)

branches/subpixellayout/Source/WebCore/fileapi/BlobURL.cpp

@@ -40 +40 @@
 namespace WebCore {
 
-static const char blobProtocol[] = "blob";
+const char BlobURL::kBlobProtocol[] = "blob";
 
 KURL BlobURL::createPublicURL(SecurityOrigin* securityOrigin)
@@ -55 +55 @@
 String BlobURL::getIdentifier(const KURL& url)
 {
-    ASSERT(url.protocolIs(blobProtocol));
+    ASSERT(url.protocolIs(kBlobProtocol));
 
     unsigned startIndex = url.pathAfterLastSlash();
@@ -66 +66 @@
     if (originString == "null")
         return KURL();
-    String urlString = blobProtocol;
+    String urlString = kBlobProtocol;
     urlString += ":";
     urlString += encodeWithURLEscapeSequences(originString);

branches/subpixellayout/Source/WebCore/fileapi/BlobURL.h

@@ -52 +52 @@
     static KURL createInternalURL();
     static String getIdentifier(const KURL&);
+    static const char* blobProtocol() { return kBlobProtocol; }
 
 private:
     static KURL createBlobURL(const String& originString);
+    static const char kBlobProtocol[];
     BlobURL() { }
 };

branches/subpixellayout/Source/WebCore/page/Frame.cpp

@@ -904 +904 @@
     if (!m_view)
         return IntRect();
-    return IntRect(IntPoint(), expandedIntSize(m_view->contentsSize()));
+    return IntRect(IntPoint(), m_view->contentsSize());
 }
 

branches/subpixellayout/Source/WebCore/page/FrameView.h

@@ -307 +307 @@
     bool isTrackingRepaints() const { return m_isTrackingRepaints; }
     void resetTrackedRepaints() { m_trackedRepaintRects.clear(); }
-    const Vector<FixedRect>& trackedRepaintRects() const { return m_trackedRepaintRects; }
+    const Vector<LayoutRect>& trackedRepaintRects() const { return m_trackedRepaintRects; }
 
     typedef HashSet<ScrollableArea*> ScrollableAreaSet;
@@ -465 +465 @@
     
     bool m_isTrackingRepaints; // Used for testing.
-    Vector<FixedRect> m_trackedRepaintRects;
+    Vector<LayoutRect> m_trackedRepaintRects;
 
     bool m_shouldUpdateWhileOffscreen;

branches/subpixellayout/Source/WebCore/page/mac/FrameMac.mm

@@ -81 +81 @@
         graphicsContext.save();
         graphicsContext.translate(-rect.origin.x, -rect.origin.y);
-        m_view->paintContents(&graphicsContext, enclosingIntRect(rect));
+        m_view->paintContents(&graphicsContext, IntRect(rect));
         graphicsContext.restore();