Title: [141040] trunk/Source
Revision
141040
Author
commit-qu...@webkit.org
Date
2013-01-28 20:32:00 -0800 (Mon, 28 Jan 2013)

Log Message

[TexMap] Enable debug borders and repaint counter via Settings.
https://bugs.webkit.org/show_bug.cgi?id=107198

Patch by Huang Dongsung <luxte...@company100.net> on 2013-01-28
Reviewed by Benjamin Poulain.

Source/WebKit/efl:

If WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS is set to 1, set
showDebugBorders and showRepaintCounter in Settings to true.

* ewk/ewk_view.cpp:
(_ewk_view_priv_new):

Source/WebKit/gtk:

If WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS is set to 1, set
showDebugBorders and showRepaintCounter in Settings to true.

* webkit/webkitwebview.cpp:
(webkit_web_view_update_settings):

Source/WebKit/qt:

If WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS is set to 1, set
showDebugBorders and showRepaintCounter in Settings to true.

* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):

Source/WebKit2:

Currently, if the environment variable WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS
is set to 1, only CoordinatedBacking shows debug borders and repaint counter.

This patch makes the environment variable change Settings.

In addition, Qt uses WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS instead of
QT_WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS from now.

After Bug 105787, all backing stores and platform layers in TextureMapper can
show debug borders and repaint counter.

* UIProcess/API/efl/EwkView.cpp:
(EwkView::EwkView):
* UIProcess/API/gtk/WebKitSettings.cpp:
(webKitSettingsSetProperty):
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):

Modified Paths

Diff

Modified: trunk/Source/WebKit/efl/ChangeLog (141039 => 141040)


--- trunk/Source/WebKit/efl/ChangeLog	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit/efl/ChangeLog	2013-01-29 04:32:00 UTC (rev 141040)
@@ -1,3 +1,16 @@
+2013-01-28  Huang Dongsung  <luxte...@company100.net>
+
+        [TexMap] Enable debug borders and repaint counter via Settings.
+        https://bugs.webkit.org/show_bug.cgi?id=107198
+
+        Reviewed by Benjamin Poulain.
+
+        If WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS is set to 1, set
+        showDebugBorders and showRepaintCounter in Settings to true.
+
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new):
+
 2013-01-22  Anders Carlsson  <ander...@apple.com>
 
         Use a platforom strategy for local storage

Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (141039 => 141040)


--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2013-01-29 04:32:00 UTC (rev 141040)
@@ -839,6 +839,10 @@
     priv->pageSettings->setInteractiveFormValidationEnabled(true);
 #if USE(ACCELERATED_COMPOSITING)
     priv->pageSettings->setAcceleratedCompositingEnabled(false);
+    char* debugVisualsEnvironment = getenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS");
+    bool showDebugVisuals = debugVisualsEnvironment && !strcmp(debugVisualsEnvironment, "1");
+    priv->pageSettings->setShowDebugBorders(showDebugVisuals);
+    priv->pageSettings->setShowRepaintCounter(showDebugVisuals);
 #endif
 
     url = ""

Modified: trunk/Source/WebKit/gtk/ChangeLog (141039 => 141040)


--- trunk/Source/WebKit/gtk/ChangeLog	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-01-29 04:32:00 UTC (rev 141040)
@@ -1,3 +1,16 @@
+2013-01-28  Huang Dongsung  <luxte...@company100.net>
+
+        [TexMap] Enable debug borders and repaint counter via Settings.
+        https://bugs.webkit.org/show_bug.cgi?id=107198
+
+        Reviewed by Benjamin Poulain.
+
+        If WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS is set to 1, set
+        showDebugBorders and showRepaintCounter in Settings to true.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_update_settings):
+
 2013-01-25  Joone Hur  <joone....@intel.com>
 
         [GTK][AC] Use new Clutter APIs instead of deprecated APIs

Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (141039 => 141040)


--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2013-01-29 04:32:00 UTC (rev 141040)
@@ -3436,6 +3436,10 @@
 
 #if USE(ACCELERATED_COMPOSITING)
     coreSettings->setAcceleratedCompositingEnabled(settingsPrivate->enableAcceleratedCompositing);
+    char* debugVisualsEnvironment = getenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS");
+    bool showDebugVisuals = debugVisualsEnvironment && !strcmp(debugVisualsEnvironment, "1");
+    coreSettings->setShowDebugBorders(showDebugVisuals);
+    coreSettings->setShowRepaintCounter(showDebugVisuals);
 #endif
 
 #if ENABLE(WEB_AUDIO)

Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (141039 => 141040)


--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp	2013-01-29 04:32:00 UTC (rev 141040)
@@ -150,6 +150,10 @@
         settings->setAcceleratedCompositingForAnimationEnabled(value);
         settings->setAcceleratedCompositingForVideoEnabled(false);
         settings->setAcceleratedCompositingForPluginsEnabled(false);
+
+        bool showDebugVisuals = qgetenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS") == "1";
+        settings->setShowDebugBorders(showDebugVisuals);
+        settings->setShowRepaintCounter(showDebugVisuals);
 #endif
 #if ENABLE(WEBGL)
         value = attributes.value(QWebSettings::WebGLEnabled,

Modified: trunk/Source/WebKit/qt/ChangeLog (141039 => 141040)


--- trunk/Source/WebKit/qt/ChangeLog	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-01-29 04:32:00 UTC (rev 141040)
@@ -1,3 +1,16 @@
+2013-01-28  Huang Dongsung  <luxte...@company100.net>
+
+        [TexMap] Enable debug borders and repaint counter via Settings.
+        https://bugs.webkit.org/show_bug.cgi?id=107198
+
+        Reviewed by Benjamin Poulain.
+
+        If WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS is set to 1, set
+        showDebugBorders and showRepaintCounter in Settings to true.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+
 2013-01-24  Hajime Morrita  <morr...@google.com>
 
         There are a few of wrong removeAllChildren() call

Modified: trunk/Source/WebKit2/ChangeLog (141039 => 141040)


--- trunk/Source/WebKit2/ChangeLog	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-29 04:32:00 UTC (rev 141040)
@@ -1,3 +1,28 @@
+2013-01-28  Huang Dongsung  <luxte...@company100.net>
+
+        [TexMap] Enable debug borders and repaint counter via Settings.
+        https://bugs.webkit.org/show_bug.cgi?id=107198
+
+        Reviewed by Benjamin Poulain.
+
+        Currently, if the environment variable WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS
+        is set to 1, only CoordinatedBacking shows debug borders and repaint counter.
+
+        This patch makes the environment variable change Settings.
+
+        In addition, Qt uses WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS instead of
+        QT_WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS from now.
+
+        After Bug 105787, all backing stores and platform layers in TextureMapper can
+        show debug borders and repaint counter.
+
+        * UIProcess/API/efl/EwkView.cpp:
+        (EwkView::EwkView):
+        * UIProcess/API/gtk/WebKitSettings.cpp:
+        (webKitSettingsSetProperty):
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::initialize):
+
 2013-01-28  Anders Carlsson  <ander...@apple.com>
 
         Move Mach port handling from WorkQueue to Connection

Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (141039 => 141040)


--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp	2013-01-29 04:32:00 UTC (rev 141040)
@@ -149,6 +149,10 @@
 #if USE(COORDINATED_GRAPHICS)
     m_pageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);
     m_pageProxy->pageGroup()->preferences()->setForceCompositingMode(true);
+    char* debugVisualsEnvironment = getenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS");
+    bool showDebugVisuals = debugVisualsEnvironment && !strcmp(debugVisualsEnvironment, "1");
+    m_pageProxy->pageGroup()->preferences()->setCompositingBordersVisible(showDebugVisuals);
+    m_pageProxy->pageGroup()->preferences()->setCompositingRepaintCountersVisible(showDebugVisuals);
 #if ENABLE(WEBGL)
     m_pageProxy->pageGroup()->preferences()->setWebGLEnabled(true);
 #endif

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (141039 => 141040)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp	2013-01-29 04:32:00 UTC (rev 141040)
@@ -257,7 +257,13 @@
         webkit_settings_set_media_playback_allows_inline(settings, g_value_get_boolean(value));
         break;
     case PROP_DRAW_COMPOSITING_INDICATORS:
-        webkit_settings_set_draw_compositing_indicators(settings, g_value_get_boolean(value));
+        if (g_value_get_boolean(value))
+            webkit_settings_set_draw_compositing_indicators(settings, g_value_get_boolean(value));
+        else {
+            char* debugVisualsEnvironment = getenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS");
+            bool showDebugVisuals = debugVisualsEnvironment && !strcmp(debugVisualsEnvironment, "1");
+            webkit_settings_set_draw_compositing_indicators(settings, showDebugVisuals);
+        }
         break;
     case PROP_ENABLE_SITE_SPECIFIC_QUIRKS:
         webkit_settings_set_enable_site_specific_quirks(settings, g_value_get_boolean(value));

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (141039 => 141040)


--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2013-01-29 04:16:56 UTC (rev 141039)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2013-01-29 04:32:00 UTC (rev 141040)
@@ -323,6 +323,9 @@
     // Any page setting should preferrable be set before creating the page.
     webPageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);
     webPageProxy->pageGroup()->preferences()->setForceCompositingMode(true);
+    bool showDebugVisuals = qgetenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS") == "1";
+    webPageProxy->pageGroup()->preferences()->setCompositingBordersVisible(showDebugVisuals);
+    webPageProxy->pageGroup()->preferences()->setCompositingRepaintCountersVisible(showDebugVisuals);
     webPageProxy->pageGroup()->preferences()->setFrameFlatteningEnabled(true);
     webPageProxy->pageGroup()->preferences()->setWebGLEnabled(true);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to