Title: [119861] trunk/Source
- Revision
- 119861
- Author
- [email protected]
- Date
- 2012-06-08 13:31:28 -0700 (Fri, 08 Jun 2012)
Log Message
[chromium] Clean up some unnecessary LayerChromium.h includes
https://bugs.webkit.org/show_bug.cgi?id=88599
Reviewed by Adam Barth.
Source/WebCore:
Reworks test code slightly to use WebCore interfaces.
* testing/Internals.cpp:
(WebCore::Internals::setBackgroundBlurOnNode):
Source/WebKit/chromium:
Removes unused include, update comment.
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::platformLayer):
(WebKit::WebMediaPlayerClientImpl::paint):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (119860 => 119861)
--- trunk/Source/WebCore/ChangeLog 2012-06-08 20:13:59 UTC (rev 119860)
+++ trunk/Source/WebCore/ChangeLog 2012-06-08 20:31:28 UTC (rev 119861)
@@ -1,3 +1,15 @@
+2012-06-08 James Robinson <[email protected]>
+
+ [chromium] Clean up some unnecessary LayerChromium.h includes
+ https://bugs.webkit.org/show_bug.cgi?id=88599
+
+ Reviewed by Adam Barth.
+
+ Reworks test code slightly to use WebCore interfaces.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setBackgroundBlurOnNode):
+
2012-06-08 Erik Arvidsson <[email protected]>
[V8] Keep TextTrackList alive as long as its owner is alive
Modified: trunk/Source/WebCore/testing/Internals.cpp (119860 => 119861)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-06-08 20:13:59 UTC (rev 119860)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-06-08 20:31:28 UTC (rev 119861)
@@ -82,9 +82,10 @@
#endif
#if PLATFORM(CHROMIUM)
+#include "FilterOperation.h"
#include "FilterOperations.h"
#include "GraphicsLayer.h"
-#include "LayerChromium.h"
+#include "GraphicsLayerChromium.h"
#include "RenderLayerBacking.h"
#endif
@@ -468,15 +469,9 @@
return;
}
- PlatformLayer* platformLayer = graphicsLayer->platformLayer();
- if (!platformLayer) {
- ec = INVALID_NODE_TYPE_ERR;
- return;
- }
-
- WebKit::WebFilterOperations filters;
- filters.append(WebKit::WebFilterOperation::createBlurFilter(blurLength));
- platformLayer->setBackgroundFilters(filters);
+ FilterOperations filters;
+ filters.operations().append(BlurFilterOperation::create(Length(blurLength, Fixed), FilterOperation::BLUR));
+ static_cast<GraphicsLayerChromium*>(graphicsLayer)->setBackgroundFilters(filters);
}
#else
void Internals::setBackgroundBlurOnNode(Node*, int, ExceptionCode&)
Modified: trunk/Source/WebKit/chromium/ChangeLog (119860 => 119861)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-08 20:13:59 UTC (rev 119860)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-08 20:31:28 UTC (rev 119861)
@@ -1,3 +1,16 @@
+2012-06-08 James Robinson <[email protected]>
+
+ [chromium] Clean up some unnecessary LayerChromium.h includes
+ https://bugs.webkit.org/show_bug.cgi?id=88599
+
+ Reviewed by Adam Barth.
+
+ Removes unused include, update comment.
+
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::platformLayer):
+ (WebKit::WebMediaPlayerClientImpl::paint):
+
2012-06-08 Jochen Eisinger <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (119860 => 119861)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-06-08 20:13:59 UTC (rev 119860)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-06-08 20:31:28 UTC (rev 119861)
@@ -19,7 +19,6 @@
#include "PlatformContextSkia.h"
#include "RenderView.h"
#include "TimeRanges.h"
-#include "VideoLayerChromium.h"
#include "WebAudioSourceProvider.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
@@ -331,10 +330,10 @@
}
#if USE(ACCELERATED_COMPOSITING)
-PlatformLayer* WebMediaPlayerClientImpl::platformLayer() const
+LayerChromium* WebMediaPlayerClientImpl::platformLayer() const
{
ASSERT(m_supportsAcceleratedCompositing);
- return m_videoLayer.unwrap<VideoLayerChromium>();
+ return m_videoLayer.unwrap<LayerChromium>();
}
#endif
@@ -627,7 +626,7 @@
{
#if USE(ACCELERATED_COMPOSITING)
// If we are using GPU to render video, ignore requests to paint frames into
- // canvas because it will be taken care of by VideoLayerChromium.
+ // canvas because it will be taken care of by WebVideoLayer.
if (acceleratedRenderingInUse())
return;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
