Title: [155649] trunk/Source
Revision
155649
Author
rn...@webkit.org
Date
2013-09-12 14:04:17 -0700 (Thu, 12 Sep 2013)

Log Message

Source/_javascript_Core: Qt build fix. Add a return to make the compiler happy.

* dfg/DFGGPRInfo.h:
(JSC::DFG::JSValueRegs::gpr):

Source/WebCore: Qt and Windows build fix.

* page/animation/CSSPropertyAnimation.cpp:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (155648 => 155649)


--- trunk/Source/_javascript_Core/ChangeLog	2013-09-12 21:02:39 UTC (rev 155648)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-09-12 21:04:17 UTC (rev 155649)
@@ -1,3 +1,10 @@
+2013-09-12  Ryosuke Niwa  <rn...@webkit.org>
+
+        Qt build fix. Add a return to make the compiler happy.
+
+        * dfg/DFGGPRInfo.h:
+        (JSC::DFG::JSValueRegs::gpr):
+
 2013-09-12  Filip Pizlo  <fpi...@apple.com>
 
         DFG::GenerationInfo init/fill methods shouldn't duplicate a bunch of logic

Modified: trunk/Source/_javascript_Core/dfg/DFGGPRInfo.h (155648 => 155649)


--- trunk/Source/_javascript_Core/dfg/DFGGPRInfo.h	2013-09-12 21:02:39 UTC (rev 155648)
+++ trunk/Source/_javascript_Core/dfg/DFGGPRInfo.h	2013-09-12 21:04:17 UTC (rev 155649)
@@ -166,6 +166,8 @@
         case PayloadWord:
             return payloadGPR();
         }
+        ASSERT_NOT_REACHED();
+        return tagGPR();
     }
 
 private:

Modified: trunk/Source/WebCore/ChangeLog (155648 => 155649)


--- trunk/Source/WebCore/ChangeLog	2013-09-12 21:02:39 UTC (rev 155648)
+++ trunk/Source/WebCore/ChangeLog	2013-09-12 21:04:17 UTC (rev 155649)
@@ -1,3 +1,9 @@
+2013-09-12  Ryosuke Niwa  <rn...@webkit.org>
+
+        Qt and Windows build fix.
+
+        * page/animation/CSSPropertyAnimation.cpp:
+
 2013-09-11  Ryosuke Niwa  <rn...@webkit.org>
 
         Encapsulate globals in CSSPropertyAnimation.cpp

Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (155648 => 155649)


--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp	2013-09-12 21:02:39 UTC (rev 155648)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp	2013-09-12 21:04:17 UTC (rev 155649)
@@ -1131,7 +1131,7 @@
     Vector<AnimationPropertyWrapperBase*> m_propertyWrappers;
     unsigned m_propertyToIdMap[numCSSProperties];
 
-    const unsigned cInvalidPropertyWrapperIndex = UINT_MAX;
+    static const unsigned cInvalidPropertyWrapperIndex = UINT_MAX;
 };
 
 void CSSPropertyAnimationWrapperMap::addShorthandProperties()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to