Title: [97924] trunk/Source/WebCore
- Revision
- 97924
- Author
- [email protected]
- Date
- 2011-10-19 19:42:45 -0700 (Wed, 19 Oct 2011)
Log Message
[chromium] Fix webkit style on a few files.
https://bugs.webkit.org/show_bug.cgi?id=70441
Patch by Shawn Singh <[email protected]> on 2011-10-19
Reviewed by James Robinson.
Tested with existing layout and unit tests.
* platform/graphics/chromium/LayerChromium.cpp:
* platform/graphics/chromium/LayerChromium.h:
(WebCore::LayerChromium::setIsMask):
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::initialize):
* platform/graphics/chromium/LayerRendererChromium.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97923 => 97924)
--- trunk/Source/WebCore/ChangeLog 2011-10-20 02:28:38 UTC (rev 97923)
+++ trunk/Source/WebCore/ChangeLog 2011-10-20 02:42:45 UTC (rev 97924)
@@ -1,3 +1,19 @@
+2011-10-19 Shawn Singh <[email protected]>
+
+ [chromium] Fix webkit style on a few files.
+ https://bugs.webkit.org/show_bug.cgi?id=70441
+
+ Reviewed by James Robinson.
+
+ Tested with existing layout and unit tests.
+
+ * platform/graphics/chromium/LayerChromium.cpp:
+ * platform/graphics/chromium/LayerChromium.h:
+ (WebCore::LayerChromium::setIsMask):
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::initialize):
+ * platform/graphics/chromium/LayerRendererChromium.h:
+
2011-10-19 Nat Duca <[email protected]>
[chromium] Route requestAnimationFrame through CCProxy in threaded mode
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (97923 => 97924)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-10-20 02:28:38 UTC (rev 97923)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-10-20 02:42:45 UTC (rev 97924)
@@ -31,12 +31,10 @@
#include "config.h"
#if USE(ACCELERATED_COMPOSITING)
-
#include "LayerChromium.h"
#include "cc/CCLayerImpl.h"
#include "cc/CCLayerTreeHost.h"
-#include "GraphicsContext3D.h"
#if USE(SKIA)
#include "NativeImageSkia.h"
#include "PlatformContextSkia.h"
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h (97923 => 97924)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2011-10-20 02:28:38 UTC (rev 97923)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2011-10-20 02:42:45 UTC (rev 97924)
@@ -160,7 +160,7 @@
virtual bool drawsContent() const { return false; }
virtual void paintContentsIfDirty() { }
virtual void updateCompositorResources(GraphicsContext3D*, TextureAllocator*) { }
- virtual void setIsMask(bool) {}
+ virtual void setIsMask(bool) { }
virtual void unreserveContentsTexture() { }
virtual void bindContentsTexture() { }
virtual void protectVisibleTileTextures() { }
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (97923 => 97924)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-10-20 02:28:38 UTC (rev 97923)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-10-20 02:42:45 UTC (rev 97924)
@@ -41,17 +41,17 @@
#include "GraphicsContext3D.h"
#include "LayerChromium.h"
#include "LayerPainterChromium.h"
-#include "ManagedTexture.h"
#include "LayerTextureUpdaterCanvas.h"
+#include "ManagedTexture.h"
#include "NonCompositedContentHost.h"
#include "NotImplemented.h"
#include "PlatformColor.h"
#include "RenderSurfaceChromium.h"
#include "TextStream.h"
#include "TextureManager.h"
-#include "TreeSynchronizer.h"
#include "TraceEvent.h"
#include "TrackingTextureAllocator.h"
+#include "TreeSynchronizer.h"
#include "WebGLLayerChromium.h"
#include "cc/CCLayerImpl.h"
#include "cc/CCLayerTreeHostCommon.h"
@@ -157,9 +157,8 @@
bool LayerRendererChromium::initialize()
{
m_context->makeContextCurrent();
- if (settings().acceleratePainting) {
+ if (settings().acceleratePainting)
m_capabilities.usingAcceleratedPainting = true;
- }
WebCore::Extensions3D* extensions = m_context->getExtensions();
m_capabilities.usingMapSub = extensions->supports("GL_CHROMIUM_map_sub");
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (97923 => 97924)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-10-20 02:28:38 UTC (rev 97923)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-10-20 02:42:45 UTC (rev 97924)
@@ -130,7 +130,7 @@
const CCVideoLayerImpl::RGBAProgram* videoLayerRGBAProgram();
const CCVideoLayerImpl::YUVProgram* videoLayerYUVProgram();
- void getFramebufferPixels(void *pixels, const IntRect& rect);
+ void getFramebufferPixels(void *pixels, const IntRect&);
TextureManager* renderSurfaceTextureManager() const { return m_renderSurfaceTextureManager.get(); }
TextureAllocator* renderSurfaceTextureAllocator() const { return m_renderSurfaceTextureAllocator.get(); }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
