Source/JavaScriptCore: Qt build fix. Add a return to make the compiler happy.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Sep 2013 21:04:17 +0000 (21:04 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Sep 2013 21:04:17 +0000 (21:04 +0000)
* dfg/DFGGPRInfo.h:
(JSC::DFG::JSValueRegs::gpr):

Source/WebCore: Qt and Windows build fix.

* page/animation/CSSPropertyAnimation.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/dfg/DFGGPRInfo.h
Source/WebCore/ChangeLog
Source/WebCore/page/animation/CSSPropertyAnimation.cpp

index e1473aea1a42c973907ae07b43ea40fc979c02db..ed459959e6d263cfb56bc2848144f5aa09876cf1 100644 (file)
@@ -1,3 +1,10 @@
+2013-09-12  Ryosuke Niwa  <rniwa@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  <fpizlo@apple.com>
 
         DFG::GenerationInfo init/fill methods shouldn't duplicate a bunch of logic
index 1f299cc574146e7a95920b16022c486c31d380b8..3ffcb4e31640c5fdd25060164e6ce600e2197f7f 100644 (file)
@@ -166,6 +166,8 @@ public:
         case PayloadWord:
             return payloadGPR();
         }
+        ASSERT_NOT_REACHED();
+        return tagGPR();
     }
 
 private:
index 2dedf4a7b0d653ce121c968dbee4be8751a7f4a1..2e71df62769fc80d5833c5f62f23963e643fe75f 100644 (file)
@@ -1,3 +1,9 @@
+2013-09-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Qt and Windows build fix.
+
+        * page/animation/CSSPropertyAnimation.cpp:
+
 2013-09-11  Ryosuke Niwa  <rniwa@webkit.org>
 
         Encapsulate globals in CSSPropertyAnimation.cpp
index 30eb23002c56306a85b9dcb3631544988b52de0b..ef08d6817d9f5edf5926dd53d417cf7f3aeef858 100644 (file)
@@ -1131,7 +1131,7 @@ private:
     Vector<AnimationPropertyWrapperBase*> m_propertyWrappers;
     unsigned m_propertyToIdMap[numCSSProperties];
 
-    const unsigned cInvalidPropertyWrapperIndex = UINT_MAX;
+    static const unsigned cInvalidPropertyWrapperIndex = UINT_MAX;
 };
 
 void CSSPropertyAnimationWrapperMap::addShorthandProperties()