Changeset 169544 in webkit

Timestamp:

Jun 2, 2014 1:53:58 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

WebCore build fix for webreplay
​https://bugs.webkit.org/show_bug.cgi?id=133401

Patch by Zsolt Borbely <​zsborbely.u-szeged@partner.samsung.com> on 2014-06-02
Reviewed by Darin Adler.

• replay/MemoizedDOMResult.cpp:

(WebCore::MemoizedDOMResultBase::createFromEncodedResult):
Add a default nullptr return in order to avoid a gcc warning.
The warning is because of a non-void method that has a case which doesn't return.

• replay/ReplayController.cpp:

(WebCore::ReplayController::setForceDeterministicSettings):
Guard the ScrollingCoordinator with the appropriate #ifdef.

• replay/SerializationMethods.cpp:

Guard the KeypressCommand with COCOA as it is only present there.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• replay/MemoizedDOMResult.cpp (modified) (1 diff)
• replay/ReplayController.cpp (modified) (1 diff)
• replay/SerializationMethods.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-02  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
+
+        WebCore build fix for webreplay
+        https://bugs.webkit.org/show_bug.cgi?id=133401
+
+        Reviewed by Darin Adler.
+
+        * replay/MemoizedDOMResult.cpp:
+        (WebCore::MemoizedDOMResultBase::createFromEncodedResult):
+        Add a default nullptr return in order to avoid a gcc warning.
+        The warning is because of a non-void method that has a case which doesn't return.
+        * replay/ReplayController.cpp:
+        (WebCore::ReplayController::setForceDeterministicSettings):
+        Guard the ScrollingCoordinator with the appropriate #ifdef.
+        * replay/SerializationMethods.cpp:
+        Guard the KeypressCommand with COCOA as it is only present there.
+
 2014-06-02  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/replay/MemoizedDOMResult.cpp

@@ -56 +56 @@
 #undef CREATE_DECODE_SWITCH_CASE
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return nullptr;
 }
 

trunk/Source/WebCore/replay/ReplayController.cpp

@@ -114 +114 @@
     }
 
+#if ENABLE(ASYNC_SCROLLING)
     if (ScrollingCoordinator* scrollingCoordinator = m_page.scrollingCoordinator())
         scrollingCoordinator->replaySessionStateDidChange();
+#endif
 }
 

trunk/Source/WebCore/replay/SerializationMethods.cpp

@@ -46 +46 @@
 #include <wtf/text/Base64.h>
 
-using WebCore::KeypressCommand;
 using WebCore::IntPoint;
 using WebCore::MimeClassInfo;
@@ -62 +61 @@
 
 #if PLATFORM(COCOA)
+using WebCore::KeypressCommand;
 using WebCore::PlatformWheelEventPhase;
 #endif