Changeset 158279 in webkit

Timestamp:

Oct 30, 2013, 10:40:06 AM (12 years ago)

Author:

Antti Koivisto

Message:

Add debug settings for simple line layout
​https://bugs.webkit.org/show_bug.cgi?id=123514

Source/WebCore:

Reviewed by Andreas Kling.

• WebCore.exp.in:
• page/Settings.in:

Add simpleLineLayoutEnabled and simpleLineLayoutDebugBordersEnabled.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::paintDebugBorders):
(WebCore::SimpleLineLayout::paintFlow):

Source/WebKit2:

Reviewed by Andreas Kling.

Expose debug settings.

• Shared/WebPreferencesStore.h:
• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetSimpleLineLayoutEnabled):
(WKPreferencesGetSimpleLineLayoutEnabled):
(WKPreferencesSetSimpleLineLayoutDebugBordersEnabled):
(WKPreferencesGetSimpleLineLayoutDebugBordersEnabled):

• UIProcess/API/C/WKPreferencesPrivate.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (2 diffs)
• WebCore/page/Settings.in (modified) (1 diff)
• WebCore/rendering/SimpleLineLayout.cpp (modified) (3 diffs)
• WebCore/rendering/SimpleLineLayoutFunctions.cpp (modified) (5 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebPreferencesStore.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-30  Antti Koivisto  <antti@apple.com>
+
+        Add debug settings for simple line layout
+        https://bugs.webkit.org/show_bug.cgi?id=123514
+
+        Reviewed by Andreas Kling.
+
+        * WebCore.exp.in:
+        * page/Settings.in:
+        
+            Add simpleLineLayoutEnabled and simpleLineLayoutDebugBordersEnabled.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::paintDebugBorders):
+        (WebCore::SimpleLineLayout::paintFlow):
+
 2013-10-30  peavo@outlook.com  <peavo@outlook.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1193 +1193 @@
 __ZN7WebCore8Settings25setUserStyleSheetLocationERKNS_3URLE
 __ZN7WebCore8Settings26defaultMinDOMTimerIntervalEv
+__ZN7WebCore8Settings26setSimpleLineLayoutEnabledEb
 __ZN7WebCore8Settings27setJavaEnabledForLocalFilesEb
 __ZN7WebCore8Settings27setLoadsImagesAutomaticallyEb
@@ -1207 +1208 @@
 __ZN7WebCore8Settings37setScrollingPerformanceLoggingEnabledEb
 __ZN7WebCore8Settings38setLowPowerVideoAudioBufferSizeEnabledEb
+__ZN7WebCore8Settings38setSimpleLineLayoutDebugBordersEnabledEb
 __ZN7WebCore8Settings41setAcceleratedCompositedAnimationsEnabledEb
 __ZN7WebCore8Settings42setHiddenPageCSSAnimationSuspensionEnabledEb

trunk/Source/WebCore/page/Settings.in

@@ -208 +208 @@
 
 minimumZoomFontSize type=float, initial=15, conditional=IOS_TEXT_AUTOSIZING
+
+simpleLineLayoutEnabled initial=true, setNeedsStyleRecalcInAllFrames=1
+simpleLineLayoutDebugBordersEnabled initial=false, setNeedsStyleRecalcInAllFrames=1

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -28 +28 @@
 
 #include "FontCache.h"
+#include "Frame.h"
 #include "GraphicsContext.h"
 #include "HitTestLocation.h"
@@ -39 +40 @@
 #include "RenderText.h"
 #include "RenderView.h"
+#include "Settings.h"
 #include "SimpleLineLayoutResolver.h"
 #include "Text.h"
@@ -60 +62 @@
     return false;
 #endif
+    if (!flow.frame().settings().simpleLineLayoutEnabled())
+        return false;
     if (!flow.firstChild())
         return false;

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -28 +28 @@
 
 #include "FontCache.h"
+#include "Frame.h"
 #include "GraphicsContext.h"
 #include "HitTestLocation.h"
@@ -38 +39 @@
 #include "RenderStyle.h"
 #include "RenderText.h"
+#include "Settings.h"
 #include "SimpleLineLayoutResolver.h"
 #include "Text.h"
@@ -46 +48 @@
 namespace SimpleLineLayout {
 
+static void paintDebugBorders(GraphicsContext& context, const LayoutRect& borderRect, const LayoutPoint& paintOffset)
+{
+    GraphicsContextStateSaver stateSaver(context);
+    context.setStrokeColor(Color(0, 255, 0), ColorSpaceDeviceRGB);
+    context.setFillColor(Color::transparent, ColorSpaceDeviceRGB);
+    IntRect rect(pixelSnappedIntRect(borderRect));
+    rect.moveBy(flooredIntPoint(paintOffset));
+    context.drawRect(rect);
+}
+
 void paintFlow(const RenderBlockFlow& flow, const Layout& layout, PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
@@ -52 +64 @@
     RenderText& textRenderer = toRenderText(*flow.firstChild());
     ASSERT(!textRenderer.firstTextBox());
+
+    bool debugBordersEnabled = flow.frame().settings().simpleLineLayoutDebugBordersEnabled();
 
     RenderStyle& style = flow.style();
@@ -67 +81 @@
         auto run = *it;
         context.drawText(font, TextRun(run.text()), run.baseline() + paintOffset);
+        if (debugBordersEnabled)
+            paintDebugBorders(context, run.rect(), paintOffset);
     }
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-10-30  Antti Koivisto  <antti@apple.com>
+
+        Add debug settings for simple line layout
+        https://bugs.webkit.org/show_bug.cgi?id=123514
+
+        Reviewed by Andreas Kling.
+        
+        Expose debug settings.
+
+        * Shared/WebPreferencesStore.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetSimpleLineLayoutEnabled):
+        (WKPreferencesGetSimpleLineLayoutEnabled):
+        (WKPreferencesSetSimpleLineLayoutDebugBordersEnabled):
+        (WKPreferencesGetSimpleLineLayoutDebugBordersEnabled):
+        * UIProcess/API/C/WKPreferencesPrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2013-10-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -166 +166 @@
     macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
     macro(ThreadedScrollingEnabled, threadedScrollingEnabled, Bool, bool, true) \
+    macro(SimpleLineLayoutEnabled, simpleLineLayoutEnabled, Bool, bool, true) \
+    macro(SimpleLineLayoutDebugBordersEnabled, simpleLineLayoutDebugBordersEnabled, Bool, bool, false) \
     \
 

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -1176 +1176 @@
     return toImpl(preferencesRef)->threadedScrollingEnabled();
 }
+
+void WKPreferencesSetSimpleLineLayoutEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+    toImpl(preferencesRef)->setSimpleLineLayoutEnabled(flag);
+}
+
+bool WKPreferencesGetSimpleLineLayoutEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->simpleLineLayoutEnabled();
+}
+
+void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+    toImpl(preferencesRef)->setSimpleLineLayoutDebugBordersEnabled(flag);
+}
+
+bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->simpleLineLayoutDebugBordersEnabled();
+}

trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h

@@ -297 +297 @@
 WK_EXPORT double WKPreferencesGetIncrementalRenderingSuppressionTimeout(WKPreferencesRef preferencesRef);
 
+// Defaults to true.
+WK_EXPORT void WKPreferencesSetSimpleLineLayoutEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetSimpleLineLayoutEnabled(WKPreferencesRef);
+
+// Defaults to false.
+WK_EXPORT void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef);
+
 WK_EXPORT void WKPreferencesResetTestRunnerOverrides(WKPreferencesRef preferencesRef);
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2454 +2454 @@
 
     settings.setLowPowerVideoAudioBufferSizeEnabled(store.getBoolValueForKey(WebPreferencesKey::lowPowerVideoAudioBufferSizeEnabledKey()));
+    settings.setSimpleLineLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::simpleLineLayoutEnabledKey()));
+    settings.setSimpleLineLayoutDebugBordersEnabled(store.getBoolValueForKey(WebPreferencesKey::simpleLineLayoutDebugBordersEnabledKey()));
 
     platformPreferencesDidChange(store);