Title: [120139] branches/safari-536-branch/Source/WebKit2
- Revision
- 120139
- Author
- [email protected]
- Date
- 2012-06-12 16:56:20 -0700 (Tue, 12 Jun 2012)
Log Message
Merged r119758 -> <rdar://problem/11430118>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (120138 => 120139)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-06-12 23:40:04 UTC (rev 120138)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-06-12 23:56:20 UTC (rev 120139)
@@ -1,3 +1,20 @@
+2012-06-12 Lucas Forschler <[email protected]>
+
+ Merge 119758
+
+ 2012-06-07 Anders Carlsson <[email protected]>
+
+ Search highlight does not scroll with the content of the page, and find overlay doesn't work, on large-enough window
+ https://bugs.webkit.org/show_bug.cgi?id=88577
+ <rdar://problem/11430118>
+
+ Reviewed by John Sullivan.
+
+ Prevent the page overlay layer from falling into tiled mode.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::createPageOverlayLayer):
+
2012-06-06 Mark Rowe <[email protected]>
Merge r119570.
Modified: branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (120138 => 120139)
--- branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2012-06-12 23:40:04 UTC (rev 120138)
+++ branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2012-06-12 23:56:20 UTC (rev 120139)
@@ -40,6 +40,7 @@
#import <WebCore/Frame.h>
#import <WebCore/FrameView.h>
#import <WebCore/GraphicsContext.h>
+#import <WebCore/GraphicsLayerCA.h>
#import <WebCore/Page.h>
#import <WebCore/RenderLayerCompositor.h>
#import <WebCore/RenderView.h>
@@ -415,6 +416,9 @@
m_pageOverlayLayer->setName("page overlay content");
#endif
+ // We don't ever want the overlay layer to become tiled because that will look bad, and
+ // we also never expect the underlying CALayer to change.
+ static_cast<GraphicsLayerCA*>(m_pageOverlayLayer.get())->setAllowTiledLayer(false);
m_pageOverlayLayer->setAcceleratesDrawing(true);
m_pageOverlayLayer->setDrawsContent(true);
m_pageOverlayLayer->setSize(m_webPage->size());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
