Title: [169957] trunk/Source/WebKit2
- Revision
- 169957
- Author
- [email protected]
- Date
- 2014-06-13 17:04:03 -0700 (Fri, 13 Jun 2014)
Log Message
Clean up layers in RemoteLayerTreeHost::clearLayers().
https://bugs.webkit.org/show_bug.cgi?id=133888
Reviewed by Tim Horton.
* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::clearLayers):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169956 => 169957)
--- trunk/Source/WebKit2/ChangeLog 2014-06-13 23:37:22 UTC (rev 169956)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-14 00:04:03 UTC (rev 169957)
@@ -1,3 +1,13 @@
+2014-06-13 Martin Hock <[email protected]>
+
+ Clean up layers in RemoteLayerTreeHost::clearLayers().
+ https://bugs.webkit.org/show_bug.cgi?id=133888
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ (WebKit::RemoteLayerTreeHost::clearLayers):
+
2014-06-13 Anders Carlsson <[email protected]>
Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (169956 => 169957)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-06-13 23:37:22 UTC (rev 169956)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-06-14 00:04:03 UTC (rev 169957)
@@ -32,11 +32,14 @@
#import "ShareableBitmap.h"
#import "WebPageProxy.h"
#import "WebProcessProxy.h"
+#import <QuartzCore/QuartzCore.h>
#import <WebCore/PlatformLayer.h>
#import <WebCore/WebActionDisablingCALayerDelegate.h>
#import <WebKitSystemInterface.h>
-#import <QuartzCore/QuartzCore.h>
+#if PLATFORM(IOS)
+#import <UIKit/UIView.h>
+#endif
using namespace WebCore;
@@ -140,7 +143,11 @@
{
for (auto& idLayer : m_layers) {
m_animationDelegates.remove(idLayer.key);
- asLayer(idLayer.value.get()).contents = nullptr;
+#if PLATFORM(IOS)
+ [idLayer.value.get() removeFromSuperview];
+#else
+ [asLayer(idLayer.value.get()) removeFromSuperlayer];
+#endif
}
m_layers.clear();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
