Title: [149387] trunk/Source/WebCore
- Revision
- 149387
- Author
- [email protected]
- Date
- 2013-04-30 11:50:39 -0700 (Tue, 30 Apr 2013)
Log Message
Formatting tweaks
https://bugs.webkit.org/show_bug.cgi?id=115427
Reviewed by Andreas Kling.
* platform/graphics/cg/GraphicsContext3DCG.cpp:
(WebCore::GraphicsContext3D::ImageExtractor::extractImage): Fixed indenting to match
normal WebKit style.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::pinnedInDirection): Removed an excess "+" that is harmless
but strange.
* platform/mac/SharedBufferMac.mm: Tweaked blank lines for better paragraphing.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149386 => 149387)
--- trunk/Source/WebCore/ChangeLog 2013-04-30 18:44:40 UTC (rev 149386)
+++ trunk/Source/WebCore/ChangeLog 2013-04-30 18:50:39 UTC (rev 149387)
@@ -1,3 +1,20 @@
+2013-04-30 Darin Adler <[email protected]>
+
+ Formatting tweaks
+ https://bugs.webkit.org/show_bug.cgi?id=115427
+
+ Reviewed by Andreas Kling.
+
+ * platform/graphics/cg/GraphicsContext3DCG.cpp:
+ (WebCore::GraphicsContext3D::ImageExtractor::extractImage): Fixed indenting to match
+ normal WebKit style.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::pinnedInDirection): Removed an excess "+" that is harmless
+ but strange.
+
+ * platform/mac/SharedBufferMac.mm: Tweaked blank lines for better paragraphing.
+
2013-04-30 Ryosuke Niwa <[email protected]>
Simplify ContainerNode::removeChildren
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (149386 => 149387)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2013-04-30 18:44:40 UTC (rev 149386)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2013-04-30 18:50:39 UTC (rev 149387)
@@ -353,8 +353,7 @@
// alpha channel. Creation of a bitmap context with an alpha channel
// doesn't seem to work unless it's premultiplied.
bitmapContext = adoptCF(CGBitmapContextCreate(0, m_imageWidth, m_imageHeight, 8, m_imageWidth * 4,
- deviceRGBColorSpaceRef(),
- kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
+ deviceRGBColorSpaceRef(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
if (!bitmapContext)
return false;
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (149386 => 149387)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2013-04-30 18:44:40 UTC (rev 149386)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2013-04-30 18:50:39 UTC (rev 149387)
@@ -1052,7 +1052,7 @@
if (fabsf(deltaY) >= fabsf(deltaX)) {
if (deltaY < 0) {
// We are trying to scroll up. Make sure we are not pinned to the top
- limitDelta.setHeight(m_scrollableArea->visibleContentRect().y() + + m_scrollableArea->scrollOrigin().y());
+ limitDelta.setHeight(m_scrollableArea->visibleContentRect().y() + m_scrollableArea->scrollOrigin().y());
} else {
// We are trying to scroll down. Make sure we are not pinned to the bottom
limitDelta.setHeight(m_scrollableArea->totalContentsSize().height() - (m_scrollableArea->visibleContentRect().maxY() + m_scrollableArea->scrollOrigin().y()));
Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (149386 => 149387)
--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2013-04-30 18:44:40 UTC (rev 149386)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2013-04-30 18:50:39 UTC (rev 149387)
@@ -114,6 +114,7 @@
return (CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBuffer:this]).leakRef();
}
+
#if !(PLATFORM(QT) && USE(QTKIT))
PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath)
{
@@ -123,5 +124,5 @@
return 0;
}
#endif
+
}
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
