[webkit-changes] [111252] branches/subpixellayout/Source/WebCore

[eae]

Title: [111252] branches/subpixellayout/Source/WebCore

Revision

111252

Author

e...@chromium.org

Date

2012-03-19 14:36:23 -0700 (Mon, 19 Mar 2012)

Log Message

Revert unnecessary changes on branch.

Modified Paths

• branches/subpixellayout/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
• branches/subpixellayout/Source/WebCore/platform/graphics/transforms/TransformState.h
• branches/subpixellayout/Source/WebCore/platform/mac/PasteboardMac.mm
• branches/subpixellayout/Source/WebCore/plugins/PluginView.cpp
• branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.h

Diff

Modified: branches/subpixellayout/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (111251 => 111252)

--- branches/subpixellayout/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp	2012-03-19 21:35:16 UTC (rev 111251)
+++ branches/subpixellayout/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp	2012-03-19 21:36:23 UTC (rev 111252)
@@ -33,7 +33,6 @@
 
 #include "AffineTransform.h"
 #include "Color.h"
-#include "FractionalLayoutRect.h"
 #include "FloatRect.h"
 #include "Gradient.h"
 #include "ImageBuffer.h"

Modified: branches/subpixellayout/Source/WebCore/platform/graphics/transforms/TransformState.h (111251 => 111252)

--- branches/subpixellayout/Source/WebCore/platform/graphics/transforms/TransformState.h	2012-03-19 21:35:16 UTC (rev 111251)
+++ branches/subpixellayout/Source/WebCore/platform/graphics/transforms/TransformState.h	2012-03-19 21:36:23 UTC (rev 111252)
@@ -29,6 +29,7 @@
 #include "AffineTransform.h"
 #include "FloatPoint.h"
 #include "FloatQuad.h"
+#include "IntSize.h"
 #include "LayoutTypes.h"
 #include "TransformationMatrix.h"
 #include <wtf/OwnPtr.h>

Modified: branches/subpixellayout/Source/WebCore/platform/mac/PasteboardMac.mm (111251 => 111252)

--- branches/subpixellayout/Source/WebCore/platform/mac/PasteboardMac.mm	2012-03-19 21:35:16 UTC (rev 111251)
+++ branches/subpixellayout/Source/WebCore/platform/mac/PasteboardMac.mm	2012-03-19 21:36:23 UTC (rev 111252)
@@ -317,7 +317,7 @@
         return [(NSString *)platformStrategies()->pasteboardStrategy()->stringForType(NSStringPboardType, m_pasteboardName) precomposedStringWithCanonicalMapping];
     
     NSAttributedString *attributedString = nil;
-    NSString *string = nil;
+    NSString *string;
 
     if (types.contains(String(NSRTFDPboardType))) {
         RefPtr<SharedBuffer> data = "" m_pasteboardName);

Modified: branches/subpixellayout/Source/WebCore/plugins/PluginView.cpp (111251 => 111252)

--- branches/subpixellayout/Source/WebCore/plugins/PluginView.cpp	2012-03-19 21:35:16 UTC (rev 111251)
+++ branches/subpixellayout/Source/WebCore/plugins/PluginView.cpp	2012-03-19 21:36:23 UTC (rev 111252)
@@ -145,11 +145,11 @@
 
 #if OS(WINDOWS)
     // On Windows always call plugin to change geometry.
-    setNPWindowRect(pixelSnappedIntRect(rect));
+    setNPWindowRect(rect);
 #elif defined(XP_UNIX)
     // On Unix, multiple calls to setNPWindow() in windowed mode causes Flash to crash
     if (m_mode == NP_FULL || !m_isWindowed)
-        setNPWindowRect(pixelSnappedIntRect(rect));
+        setNPWindowRect(rect);
 #endif
 }
 

Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.h (111251 => 111252)

--- branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.h	2012-03-19 21:35:16 UTC (rev 111251)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.h	2012-03-19 21:36:23 UTC (rev 111252)
@@ -33,14 +33,12 @@
 namespace WebCore {
 
 class Element;
-class FractionalLayoutRect;
 class FractionalLayoutPoint;
 class FloatPoint;
-class FloatRect;
 class FloatSize;
 class Frame;
-class IntRect;
 class IntPoint;
+class IntRect;
 class RenderObject;
 class TextStream;
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes