<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179962] trunk/Source/WebKit/win</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179962">179962</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-11 14:48:27 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Accelerated compositing should be disabled when graphics card does not support it.
https://bugs.webkit.org/show_bug.cgi?id=140667
Patch by peavo@outlook.com <peavo@outlook.com> on 2015-02-11
Reviewed by Alex Christensen.
* WebCoreSupport/AcceleratedCompositingContext.cpp:
(AcceleratedCompositingContext::scrollNonCompositedContents):
(AcceleratedCompositingContext::acceleratedCompositingAvailable):
* WebCoreSupport/AcceleratedCompositingContext.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContextcpp">trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContexth">trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (179961 => 179962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-02-11 22:43:34 UTC (rev 179961)
+++ trunk/Source/WebKit/win/ChangeLog 2015-02-11 22:48:27 UTC (rev 179962)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-02-11 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Accelerated compositing should be disabled when graphics card does not support it.
+ https://bugs.webkit.org/show_bug.cgi?id=140667
+
+ Reviewed by Alex Christensen.
+
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::scrollNonCompositedContents):
+ (AcceleratedCompositingContext::acceleratedCompositingAvailable):
+ * WebCoreSupport/AcceleratedCompositingContext.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
</ins><span class="cx"> 2015-02-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: [Win] OBJID_CLIENT comparisons broken in 64-bit builds
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (179961 => 179962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2015-02-11 22:43:34 UTC (rev 179961)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2015-02-11 22:48:27 UTC (rev 179962)
</span><span class="lines">@@ -29,10 +29,12 @@
</span><span class="cx">
</span><span class="cx"> #include "WebView.h"
</span><span class="cx">
</span><ins>+#include <WebCore/DefWndProcWindowClass.h>
</ins><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameView.h>
</span><span class="cx"> #include <WebCore/GraphicsLayerTextureMapper.h>
</span><ins>+#include <WebCore/HWndDC.h>
</ins><span class="cx"> #include <WebCore/MainFrame.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/Settings.h>
</span><span class="lines">@@ -243,6 +245,77 @@
</span><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AcceleratedCompositingContext::acceleratedCompositingAvailable()
+{
+ const int width = 10;
+ const int height = 10;
+
+ // Create test window to render texture in.
+ HWND testWindow = ::CreateWindowEx(WS_EX_NOACTIVATE, defWndProcWindowClassName(), L"AcceleratedCompositingTesterWindow", WS_POPUP | WS_VISIBLE | WS_DISABLED, -width, -height, width, height, 0, 0, 0, 0);
+
+ if (!testWindow)
+ return false;
+
+ // Create GL context.
+ std::unique_ptr<WebCore::GLContext> context = GLContext::createContextForWindow(testWindow, GLContext::sharingContext());
+
+ if (!context) {
+ ::DestroyWindow(testWindow);
+ return false;
+ }
+
+ context->makeContextCurrent();
+
+ std::unique_ptr<WebCore::TextureMapper> textureMapper = TextureMapperGL::create(TextureMapper::OpenGLMode);
+
+ if (!textureMapper) {
+ ::DestroyWindow(testWindow);
+ return false;
+ }
+
+ // Create texture.
+ RefPtr<BitmapTexture> texture = textureMapper->createTexture();
+
+ if (!texture) {
+ ::DestroyWindow(testWindow);
+ return false;
+ }
+
+ texture->reset(IntSize(width, height));
+
+ // Copy bitmap data to texture.
+ const int bitmapSize = width * height;
+ int data[bitmapSize];
+ const COLORREF colorRed = RGB(255, 0, 0);
+ const COLORREF colorGreen = RGB(0, 255, 0);
+ for (int i = 0; i < bitmapSize; i++)
+ data[i] = colorGreen;
+ IntRect targetRect(0, 0, width, height);
+ IntPoint offset(0, 0);
+ int bytesPerLine = width * 4;
+ BitmapTexture::UpdateContentsFlag flags = BitmapTexture::UpdateCanModifyOriginalImageData;
+ texture->updateContents(data, targetRect, offset, bytesPerLine, flags);
+
+ // Render texture.
+ textureMapper->beginPainting();
+ FloatRect rect(0, 0, width, height);
+ textureMapper->drawTexture(*texture, rect);
+ textureMapper->endPainting();
+
+ // Set color of pixel (0, 0) to red, to make sure it is different from the bitmap color.
+ HWndDC hdc(testWindow);
+ ::SetPixel(hdc, 0, 0, colorRed);
+
+ context->swapBuffers();
+
+ // Check if pixel (0, 0) has expected color.
+ COLORREF pixelColor = ::GetPixel(hdc, 0, 0);
+
+ ::DestroyWindow(testWindow);
+
+ return pixelColor == colorGreen;
+}
+
</ins><span class="cx"> void AcceleratedCompositingContext::scheduleLayerFlush()
</span><span class="cx"> {
</span><span class="cx"> if (!enabled())
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h (179961 => 179962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h 2015-02-11 22:43:34 UTC (rev 179961)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h 2015-02-11 22:48:27 UTC (rev 179962)
</span><span class="lines">@@ -65,6 +65,8 @@
</span><span class="cx"> bool flushPendingLayerChangesSoon();
</span><span class="cx"> void scrollNonCompositedContents(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
</span><span class="cx">
</span><ins>+ static bool acceleratedCompositingAvailable();
+
</ins><span class="cx"> private:
</span><span class="cx"> WebView& m_webView;
</span><span class="cx"> std::unique_ptr<WebCore::GLContext> m_context;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (179961 => 179962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-02-11 22:43:34 UTC (rev 179961)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-02-11 22:48:27 UTC (rev 179962)
</span><span class="lines">@@ -5051,6 +5051,10 @@
</span><span class="cx"> hr = prefsPrivate->acceleratedCompositingEnabled(&enabled);
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
+ static bool acceleratedCompositingAvailable = AcceleratedCompositingContext::acceleratedCompositingAvailable();
+ enabled = enabled && acceleratedCompositingAvailable;
+#endif
</ins><span class="cx"> settings.setAcceleratedCompositingEnabled(enabled);
</span><span class="cx">
</span><span class="cx"> hr = prefsPrivate->showDebugBorders(&enabled);
</span></span></pre>
</div>
</div>
</body>
</html>