Title: [98631] trunk/Source
- Revision
- 98631
- Author
- [email protected]
- Date
- 2011-10-27 13:42:54 -0700 (Thu, 27 Oct 2011)
Log Message
Unreviewed, fix CCSchedulerStateMachine build errors.
* platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
* platform/graphics/chromium/cc/CCSchedulerStateMachine.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98630 => 98631)
--- trunk/Source/WebCore/ChangeLog 2011-10-27 20:41:05 UTC (rev 98630)
+++ trunk/Source/WebCore/ChangeLog 2011-10-27 20:42:54 UTC (rev 98631)
@@ -1,3 +1,10 @@
+2011-10-27 Nat Duca <[email protected]>
+
+ Unreviewed, fix CCSchedulerStateMachine build errors.
+
+ * platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
+ * platform/graphics/chromium/cc/CCSchedulerStateMachine.h:
+
2011-10-27 Tony Chang <[email protected]>
fix sizing of auto sized flexbox
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp (98630 => 98631)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp 2011-10-27 20:41:05 UTC (rev 98630)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp 2011-10-27 20:42:54 UTC (rev 98631)
@@ -34,20 +34,6 @@
, m_needsCommit(false)
, m_updatedThisFrame(false) { }
-CCSchedulerStateMachine::CCSchedulerStateMachine(const CCSchedulerStateMachine& that)
-{
- *this = that;
-}
-
-CCSchedulerStateMachine::CCSchedulerStateMachine& CCSchedulerStateMachine::operator=(const CCSchedulerStateMachine& that)
-{
- m_commitState = that.m_commitState;
- m_needsRedraw = that.m_needsRedraw;
- m_needsCommit = that.m_needsCommit;
- m_updatedThisFrame = that.m_updatedThisFrame;
- return *this;
-}
-
CCSchedulerStateMachine::Action CCSchedulerStateMachine::nextAction(bool insideVSyncTick) const
{
switch (m_commitState) {
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.h (98630 => 98631)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.h 2011-10-27 20:41:05 UTC (rev 98630)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.h 2011-10-27 20:42:54 UTC (rev 98631)
@@ -25,6 +25,8 @@
#ifndef CCSchedulerStateMachine_h
#define CCSchedulerStateMachine_h
+#include <wtf/Noncopyable.h>
+
namespace WebCore {
// The CCSchedulerStateMachine decides how to coordinates main thread activites
@@ -40,8 +42,6 @@
class CCSchedulerStateMachine {
public:
CCSchedulerStateMachine();
- CCSchedulerStateMachine(const CCSchedulerStateMachine& that);
- CCSchedulerStateMachine& operator=(const CCSchedulerStateMachine& that);
enum CommitState {
COMMIT_STATE_IDLE,
Modified: trunk/Source/WebKit/chromium/tests/CCSchedulerStateMachineTest.cpp (98630 => 98631)
--- trunk/Source/WebKit/chromium/tests/CCSchedulerStateMachineTest.cpp 2011-10-27 20:41:05 UTC (rev 98630)
+++ trunk/Source/WebKit/chromium/tests/CCSchedulerStateMachineTest.cpp 2011-10-27 20:42:54 UTC (rev 98631)
@@ -60,28 +60,34 @@
TEST(CCSchedulerStateMachineTest, TestNextActionBeginsFrameIfNeeded)
{
- StateMachine state;
// If no commit needed, do nothing
- state = StateMachine();
- state.setCommitState(CCSchedulerStateMachine::COMMIT_STATE_IDLE);
- state.setNeedsRedraw(false);
- state.setNeedsCommit(false);
- state.setUpdatedThisFrame(false);
- EXPECT_EQ(CCSchedulerStateMachine::ACTION_NONE, state.nextAction(false));
- EXPECT_EQ(CCSchedulerStateMachine::ACTION_NONE, state.nextAction(true));
+ {
+ StateMachine state;
+ state.setCommitState(CCSchedulerStateMachine::COMMIT_STATE_IDLE);
+ state.setNeedsRedraw(false);
+ state.setNeedsCommit(false);
+ state.setUpdatedThisFrame(false);
+ EXPECT_EQ(CCSchedulerStateMachine::ACTION_NONE, state.nextAction(false));
+ EXPECT_EQ(CCSchedulerStateMachine::ACTION_NONE, state.nextAction(true));
+ }
// If commit requested, begin a frame
- state = StateMachine();
- state.setCommitState(CCSchedulerStateMachine::COMMIT_STATE_IDLE);
- state.setNeedsRedraw(false);
- state.setNeedsCommit(true);
- state.setUpdatedThisFrame(false);
- EXPECT_EQ(CCSchedulerStateMachine::ACTION_BEGIN_FRAME, state.nextAction(false));
+ {
+ StateMachine state;
+ state.setCommitState(CCSchedulerStateMachine::COMMIT_STATE_IDLE);
+ state.setNeedsRedraw(false);
+ state.setNeedsCommit(true);
+ state.setUpdatedThisFrame(false);
+ EXPECT_EQ(CCSchedulerStateMachine::ACTION_BEGIN_FRAME, state.nextAction(false));
+ }
// Begin the frame, make sure needsCommit and commitState update correctly.
- state.updateState(CCSchedulerStateMachine::ACTION_BEGIN_FRAME);
- EXPECT_EQ(CCSchedulerStateMachine::COMMIT_STATE_FRAME_IN_PROGRESS, state.commitState());
- EXPECT_FALSE(state.needsCommit());
+ {
+ StateMachine state;
+ state.updateState(CCSchedulerStateMachine::ACTION_BEGIN_FRAME);
+ EXPECT_EQ(CCSchedulerStateMachine::COMMIT_STATE_FRAME_IN_PROGRESS, state.commitState());
+ EXPECT_FALSE(state.needsCommit());
+ }
}
TEST(CCSchedulerStateMachineTest, TestNextActionDrawsOnVSync)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
