Title: [140433] trunk/Source/WebCore
- Revision
- 140433
- Author
- [email protected]
- Date
- 2013-01-22 09:47:28 -0800 (Tue, 22 Jan 2013)
Log Message
Silence MSVC 64-bit build warning c4309 for FrameTree::invalidCount
https://bugs.webkit.org/show_bug.cgi?id=107439
Reviewed by Dimitri Glazkov.
MSVC detects that the constant notFound is truncated on assignment to
invalidCount. Since we never compare them (as it would always fail on
64-bit anyway), just initialize invalidCount directly to -1.
No new tests. No behavior changed.
* page/FrameTree.h:
(FrameTree):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140432 => 140433)
--- trunk/Source/WebCore/ChangeLog 2013-01-22 17:24:01 UTC (rev 140432)
+++ trunk/Source/WebCore/ChangeLog 2013-01-22 17:47:28 UTC (rev 140433)
@@ -1,3 +1,19 @@
+2013-01-22 Justin Schuh <[email protected]>
+
+ Silence MSVC 64-bit build warning c4309 for FrameTree::invalidCount
+ https://bugs.webkit.org/show_bug.cgi?id=107439
+
+ Reviewed by Dimitri Glazkov.
+
+ MSVC detects that the constant notFound is truncated on assignment to
+ invalidCount. Since we never compare them (as it would always fail on
+ 64-bit anyway), just initialize invalidCount directly to -1.
+
+ No new tests. No behavior changed.
+
+ * page/FrameTree.h:
+ (FrameTree):
+
2013-01-22 Zan Dobersek <[email protected]>
[Autotools] Remove the Canvas Path configuration option
Modified: trunk/Source/WebCore/page/FrameTree.h (140432 => 140433)
--- trunk/Source/WebCore/page/FrameTree.h 2013-01-22 17:24:01 UTC (rev 140432)
+++ trunk/Source/WebCore/page/FrameTree.h 2013-01-22 17:47:28 UTC (rev 140433)
@@ -20,7 +20,6 @@
#ifndef FrameTree_h
#define FrameTree_h
-#include <wtf/NotFound.h>
#include <wtf/text/AtomicString.h>
namespace WebCore {
@@ -31,7 +30,7 @@
class FrameTree {
WTF_MAKE_NONCOPYABLE(FrameTree);
public:
- const static unsigned invalidCount = static_cast<unsigned>(WTF::notFound);
+ const static unsigned invalidCount = static_cast<unsigned>(-1);
FrameTree(Frame* thisFrame, Frame* parentFrame)
: m_thisFrame(thisFrame)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
