Title: [152505] branches/safari-537-branch/Source/WebKit2
- Revision
- 152505
- Author
- [email protected]
- Date
- 2013-07-09 11:21:30 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152407. <rdar://problem/13893308>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152504 => 152505)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-09 18:17:18 UTC (rev 152504)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-09 18:21:30 UTC (rev 152505)
@@ -1,5 +1,24 @@
2013-07-09 Lucas Forschler <[email protected]>
+ Merge r152407
+
+ 2013-07-04 Anders Carlsson <[email protected]>
+
+ Paint the page background if we haven't received our first update
+ https://bugs.webkit.org/show_bug.cgi?id=118402
+ <rdar://problem/13893308>
+
+ Reviewed by Simon Fraser.
+
+ Make sure that we always paint something when we haven't received our first update from the web process.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView drawRect:]):
+ * UIProcess/DrawingAreaProxyImpl.h:
+ (WebKit::DrawingAreaProxyImpl::hasReceivedFirstUpdate):
+
+2013-07-09 Lucas Forschler <[email protected]>
+
Merge r152403
2013-07-04 Anders Carlsson <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (152504 => 152505)
--- branches/safari-537-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-07-09 18:17:18 UTC (rev 152504)
+++ branches/safari-537-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-07-09 18:21:30 UTC (rev 152505)
@@ -2165,7 +2165,7 @@
// If the window doesn't have a valid backing store, we need to fill the parts of the page that we
// didn't paint with the background color (white or clear), to avoid garbage in those areas.
- if (!_data->_windowHasValidBackingStore) {
+ if (!_data->_windowHasValidBackingStore || !drawingArea->hasReceivedFirstUpdate()) {
Vector<IntRect> unpaintedRects = unpaintedRegion.rects();
for (size_t i = 0; i < unpaintedRects.size(); ++i)
drawPageBackground(context, _data->_page.get(), unpaintedRects[i]);
Modified: branches/safari-537-branch/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (152504 => 152505)
--- branches/safari-537-branch/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2013-07-09 18:17:18 UTC (rev 152504)
+++ branches/safari-537-branch/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2013-07-09 18:21:30 UTC (rev 152505)
@@ -52,6 +52,8 @@
bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); }
#endif
+ bool hasReceivedFirstUpdate() const { return m_hasReceivedFirstUpdate; }
+
private:
explicit DrawingAreaProxyImpl(WebPageProxy*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
