Changeset 161413 in webkit

Timestamp:

Jan 7, 2014 1:36:46 AM (10 years ago)

Author:

jinwoo7.song@samsung.com

Message:

WebKit2 EFL build fix after r161387
​https://bugs.webkit.org/show_bug.cgi?id=126566

Reviewed by Andreas Kling.

Add missing ASYNC_SCROLLING macro.

• UIProcess/WebPageProxy.h:
• WebProcess/WebCoreSupport/WebChromeClient.cpp:
• WebProcess/WebCoreSupport/WebChromeClient.h:
• WebProcess/WebPage/WebPage.cpp:
• WebProcess/WebPage/WebPage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (4 diffs)
• WebProcess/WebCoreSupport/WebChromeClient.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-07  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        WebKit2 EFL build fix after r161387
+        https://bugs.webkit.org/show_bug.cgi?id=126566
+
+        Reviewed by Andreas Kling.
+
+        Add missing ASYNC_SCROLLING macro.
+
+        * UIProcess/WebPageProxy.h:
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/WebPage/WebPage.h:
+
 2014-01-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -338 +338 @@
     DrawingAreaProxy* drawingArea() const { return m_drawingArea.get(); }
     
+#if ENABLE(ASYNC_SCROLLING)
     RemoteScrollingCoordinatorProxy* scrollingCoordinatorProxy() const { return m_scrollingCoordinatorProxy.get(); }
+#endif
 
     WebBackForwardList& backForwardList() { return m_backForwardList.get(); }
@@ -1173 +1175 @@
 
     std::unique_ptr<DrawingAreaProxy> m_drawingArea;
+#if ENABLE(ASYNC_SCROLLING)
     std::unique_ptr<RemoteScrollingCoordinatorProxy> m_scrollingCoordinatorProxy;
+#endif
 
     Ref<WebProcessProxy> m_process;

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -33 +33 @@
 #include "LayerTreeHost.h"
 #include "PageBanner.h"
-#include "RemoteScrollingCoordinator.h"
 #include "WebColorChooser.h"
 #include "WebCoreArgumentCoders.h"
@@ -71 +70 @@
 #include <WebCore/Settings.h>
 
+#if ENABLE(ASYNC_SCROLLING)
+#include "RemoteScrollingCoordinator.h"
+#endif
+
 using namespace WebCore;
 using namespace HTMLNames;
@@ -800 +803 @@
 #endif
 
+#if ENABLE(ASYNC_SCROLLING)
 PassRefPtr<ScrollingCoordinator> WebChromeClient::createScrollingCoordinator(Page* page) const
 {
@@ -808 +812 @@
     return 0;
 }
+#endif
 
 #if ENABLE(TOUCH_EVENTS)

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

@@ -228 +228 @@
 #endif
 
+#if ENABLE(ASYNC_SCROLLING)
     virtual PassRefPtr<WebCore::ScrollingCoordinator> createScrollingCoordinator(WebCore::Page*) const OVERRIDE;
+#endif
 
 #if ENABLE(TOUCH_EVENTS)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -3152 +3152 @@
 }
 
+#if ENABLE(ASYNC_SCROLLING)
 ScrollingCoordinator* WebPage::scrollingCoordinator() const
 {
     return m_page->scrollingCoordinator();
 }
+#endif
 
 WebPage::SandboxExtensionTracker::~SandboxExtensionTracker()

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -184 +184 @@
     InjectedBundleBackForwardList* backForwardList();
     DrawingArea* drawingArea() const { return m_drawingArea.get(); }
+#if ENABLE(ASYNC_SCROLLING)
     WebCore::ScrollingCoordinator* scrollingCoordinator() const;
+#endif
 
     WebPageGroupProxy* pageGroup() const { return m_pageGroup.get(); }