Title: [153957] branches/safari-537-branch/Source/WebCore
- Revision
- 153957
- Author
- [email protected]
- Date
- 2013-08-12 14:02:40 -0700 (Mon, 12 Aug 2013)
Log Message
Merged r153917. <rdar://problem/14002715>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153956 => 153957)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-12 20:54:20 UTC (rev 153956)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-12 21:02:40 UTC (rev 153957)
@@ -1,3 +1,20 @@
+2013-08-12 Lucas Forschler <[email protected]>
+
+ Merge r153917
+
+ 2013-08-09 Anders Carlsson <[email protected]>
+
+ Artifacts seen sometimes with layer backed WebKit1 plug-in
+ https://bugs.webkit.org/show_bug.cgi?id=119647
+ <rdar://problem/14002715>
+
+ Reviewed by Beth Dakin.
+
+ Don't try to paint layer backed views - they will be painted by Core Animation.
+
+ * platform/mac/WidgetMac.mm:
+ (WebCore::Widget::paint):
+
2013-08-09 Lucas Forschler <[email protected]>
Merge r153907
Modified: branches/safari-537-branch/Source/WebCore/platform/mac/WidgetMac.mm (153956 => 153957)
--- branches/safari-537-branch/Source/WebCore/platform/mac/WidgetMac.mm 2013-08-12 20:54:20 UTC (rev 153956)
+++ branches/safari-537-branch/Source/WebCore/platform/mac/WidgetMac.mm 2013-08-12 21:02:40 UTC (rev 153957)
@@ -205,6 +205,12 @@
return;
NSView *view = getOuterView();
+ // We don't want to paint the view at all if it's layer backed, because then we'll end up
+ // with multiple copies of the view contents, one in the view's layer itself and one in the
+ // WebHTMLView's backing store (either a layer or the window backing store).
+ if (view.layer)
+ return;
+
// Take a reference to this Widget, because sending messages to the views can invoke arbitrary
// code, which can deref it.
RefPtr<Widget> protectedThis(this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes