Title: [151415] trunk/Source/WebCore
Revision
151415
Author
[email protected]
Date
2013-06-10 18:11:21 -0700 (Mon, 10 Jun 2013)

Log Message

Make more functions const
https://bugs.webkit.org/show_bug.cgi?id=117455

Reviewed by Benjamin Poulain.

Merge https://chromium.googlesource.com/chromium/blink/+/886866f5034d7f30f8aa607b909313f99db1f3b4.

* editing/VisibleUnits.cpp:
(WebCore::CachedLogicallyOrderedLeafBoxes::boxIndexInLeaves):
* html/canvas/WebGLRenderingContext.cpp:
* page/ContentSecurityPolicy.cpp:
(WebCore::CSPDirectiveList::evalDisabledErrorMessage):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::LineWidth::shouldIndentText):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151414 => 151415)


--- trunk/Source/WebCore/ChangeLog	2013-06-11 00:47:14 UTC (rev 151414)
+++ trunk/Source/WebCore/ChangeLog	2013-06-11 01:11:21 UTC (rev 151415)
@@ -1,3 +1,20 @@
+2013-06-10  Ryosuke Niwa  <[email protected]>
+
+        Make more functions const
+        https://bugs.webkit.org/show_bug.cgi?id=117455
+
+        Reviewed by Benjamin Poulain.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/886866f5034d7f30f8aa607b909313f99db1f3b4.
+
+        * editing/VisibleUnits.cpp:
+        (WebCore::CachedLogicallyOrderedLeafBoxes::boxIndexInLeaves):
+        * html/canvas/WebGLRenderingContext.cpp:
+        * page/ContentSecurityPolicy.cpp:
+        (WebCore::CSPDirectiveList::evalDisabledErrorMessage):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::LineWidth::shouldIndentText):
+
 2013-06-10  Jer Noble  <[email protected]>
 
         REGRESSION(r151302): Many broken webaudio/ tests on Mac port.

Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (151414 => 151415)


--- trunk/Source/WebCore/editing/VisibleUnits.cpp	2013-06-11 00:47:14 UTC (rev 151414)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp	2013-06-11 01:11:21 UTC (rev 151415)
@@ -130,10 +130,10 @@
 
     size_t size() const { return m_leafBoxes.size(); }
     const InlineBox* firstBox() const { return m_leafBoxes[0]; }
-    
+
 private:
     const Vector<InlineBox*>& collectBoxes(const RootInlineBox*);
-    int boxIndexInLeaves(const InlineTextBox*);
+    int boxIndexInLeaves(const InlineTextBox*) const;
 
     const RootInlineBox* m_rootInlineBox;
     Vector<InlineBox*> m_leafBoxes;
@@ -192,7 +192,7 @@
     return m_leafBoxes;
 }
 
-int CachedLogicallyOrderedLeafBoxes::boxIndexInLeaves(const InlineTextBox* box)
+int CachedLogicallyOrderedLeafBoxes::boxIndexInLeaves(const InlineTextBox* box) const
 {
     for (size_t i = 0; i < m_leafBoxes.size(); ++i) {
         if (box == m_leafBoxes[i])

Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (151414 => 151415)


--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2013-06-11 00:47:14 UTC (rev 151414)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2013-06-11 01:11:21 UTC (rev 151415)
@@ -196,7 +196,7 @@
         }
 
     private:
-        bool hasMoreCharacters()
+        bool hasMoreCharacters() const
         {
             return (m_position < m_length);
         }
@@ -213,7 +213,7 @@
 
         void process(UChar);
 
-        bool peek(UChar& character)
+        bool peek(UChar& character) const
         {
             if (m_position + 1 >= m_length)
                 return false;
@@ -221,7 +221,7 @@
             return true;
         }
 
-        UChar current()
+        UChar current() const
         {
             ASSERT_WITH_SECURITY_IMPLICATION(m_position < m_length);
             return m_sourceString[m_position];
@@ -232,7 +232,7 @@
             ++m_position;
         }
 
-        bool isNewline(UChar character)
+        bool isNewline(UChar character) const
         {
             // Don't attempt to canonicalize newline related characters.
             return (character == '\n' || character == '\r');

Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (151414 => 151415)


--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp	2013-06-11 00:47:14 UTC (rev 151414)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp	2013-06-11 01:11:21 UTC (rev 151415)
@@ -853,7 +853,7 @@
     bool allowBaseURI(const KURL&, ContentSecurityPolicy::ReportingStatus) const;
 
     void gatherReportURIs(DOMStringList&) const;
-    const String& evalDisabledErrorMessage() { return m_evalDisabledErrorMessage; }
+    const String& evalDisabledErrorMessage() const { return m_evalDisabledErrorMessage; }
     ContentSecurityPolicy::ReflectedXSSDisposition reflectedXSSDisposition() const { return m_reflectedXSSDisposition; }
     bool isReportOnly() const { return m_reportOnly; }
     const Vector<KURL>& reportURIs() const { return m_reportURIs; }

Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (151414 => 151415)


--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp	2013-06-11 00:47:14 UTC (rev 151414)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp	2013-06-11 01:11:21 UTC (rev 151415)
@@ -142,7 +142,7 @@
     void fitBelowFloats();
     void setTrailingWhitespaceWidth(float width) { m_trailingWhitespaceWidth = width; }
 
-    bool shouldIndentText() { return m_shouldIndentText == IndentText; }
+    bool shouldIndentText() const { return m_shouldIndentText == IndentText; }
 
 private:
     void computeAvailableWidthFromLeftAndRight()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to