Title: [107305] branches/subpixellayout/Source/WebCore
- Revision
- 107305
- Author
- [email protected]
- Date
- 2012-02-09 16:31:12 -0800 (Thu, 09 Feb 2012)
Log Message
Remove unnecessary type conversions.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/fileapi/BlobURL.cpp (107304 => 107305)
--- branches/subpixellayout/Source/WebCore/fileapi/BlobURL.cpp 2012-02-10 00:25:00 UTC (rev 107304)
+++ branches/subpixellayout/Source/WebCore/fileapi/BlobURL.cpp 2012-02-10 00:31:12 UTC (rev 107305)
@@ -39,7 +39,7 @@
namespace WebCore {
-static const char blobProtocol[] = "blob";
+const char BlobURL::kBlobProtocol[] = "blob";
KURL BlobURL::createPublicURL(SecurityOrigin* securityOrigin)
{
@@ -54,7 +54,7 @@
String BlobURL::getIdentifier(const KURL& url)
{
- ASSERT(url.protocolIs(blobProtocol));
+ ASSERT(url.protocolIs(kBlobProtocol));
unsigned startIndex = url.pathAfterLastSlash();
return url.string().substring(startIndex);
@@ -65,7 +65,7 @@
ASSERT(!originString.isEmpty());
if (originString == "null")
return KURL();
- String urlString = blobProtocol;
+ String urlString = kBlobProtocol;
urlString += ":";
urlString += encodeWithURLEscapeSequences(originString);
urlString += "/";
Modified: branches/subpixellayout/Source/WebCore/fileapi/BlobURL.h (107304 => 107305)
--- branches/subpixellayout/Source/WebCore/fileapi/BlobURL.h 2012-02-10 00:25:00 UTC (rev 107304)
+++ branches/subpixellayout/Source/WebCore/fileapi/BlobURL.h 2012-02-10 00:31:12 UTC (rev 107305)
@@ -51,9 +51,11 @@
static KURL createPublicURL(SecurityOrigin*);
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() { }
};
Modified: branches/subpixellayout/Source/WebCore/page/Frame.cpp (107304 => 107305)
--- branches/subpixellayout/Source/WebCore/page/Frame.cpp 2012-02-10 00:25:00 UTC (rev 107304)
+++ branches/subpixellayout/Source/WebCore/page/Frame.cpp 2012-02-10 00:31:12 UTC (rev 107305)
@@ -903,7 +903,7 @@
{
if (!m_view)
return IntRect();
- return IntRect(IntPoint(), expandedIntSize(m_view->contentsSize()));
+ return IntRect(IntPoint(), m_view->contentsSize());
}
IntRect Frame::tiledBackingStoreVisibleRect()
Modified: branches/subpixellayout/Source/WebCore/page/FrameView.h (107304 => 107305)
--- branches/subpixellayout/Source/WebCore/page/FrameView.h 2012-02-10 00:25:00 UTC (rev 107304)
+++ branches/subpixellayout/Source/WebCore/page/FrameView.h 2012-02-10 00:31:12 UTC (rev 107305)
@@ -306,7 +306,7 @@
void setTracksRepaints(bool);
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;
void addScrollableArea(ScrollableArea*);
@@ -464,7 +464,7 @@
double m_lastPaintTime;
bool m_isTrackingRepaints; // Used for testing.
- Vector<FixedRect> m_trackedRepaintRects;
+ Vector<LayoutRect> m_trackedRepaintRects;
bool m_shouldUpdateWhileOffscreen;
Modified: branches/subpixellayout/Source/WebCore/page/mac/FrameMac.mm (107304 => 107305)
--- branches/subpixellayout/Source/WebCore/page/mac/FrameMac.mm 2012-02-10 00:25:00 UTC (rev 107304)
+++ branches/subpixellayout/Source/WebCore/page/mac/FrameMac.mm 2012-02-10 00:31:12 UTC (rev 107305)
@@ -80,7 +80,7 @@
GraphicsContext graphicsContext((CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]);
graphicsContext.save();
graphicsContext.translate(-rect.origin.x, -rect.origin.y);
- m_view->paintContents(&graphicsContext, enclosingIntRect(rect));
+ m_view->paintContents(&graphicsContext, IntRect(rect));
graphicsContext.restore();
[resultImage unlockFocus];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
