Changeset 161548 in webkit

Timestamp:

Jan 8, 2014 11:14:37 PM (10 years ago)

Author:

jinwoo7.song@samsung.com

Message:

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

Reviewed by Tim Horton.

Add PLATFORM(MAC) guards around setExposedRect() and exposedRect()
in DrawingArea and WebFrameLoaderClient.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):

• WebProcess/WebPage/DrawingArea.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-08  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        WebKit2 EFL build fix after r161530
+        https://bugs.webkit.org/show_bug.cgi?id=126678
+
+        Reviewed by Tim Horton.
+
+        Add PLATFORM(MAC) guards around setExposedRect() and exposedRect()
+        in DrawingArea and WebFrameLoaderClient.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+        * WebProcess/WebPage/DrawingArea.h:
+
 2014-01-08  Martin Hock  <mhock@apple.com>
 

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

@@ -1239 +1239 @@
     m_frame->coreFrame()->view()->setProhibitsScrolling(shouldDisableScrolling);
     m_frame->coreFrame()->view()->setVisualUpdatesAllowedByClient(!webPage->shouldExtendIncrementalRenderingSuppression());
+#if PLATFORM(MAC)
     m_frame->coreFrame()->view()->setExposedRect(webPage->drawingArea()->exposedRect());
+#endif
 #if PLATFORM(IOS)
     m_frame->coreFrame()->view()->setDelegatesScrolling(true);

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

@@ -87 +87 @@
     virtual void mainFrameContentSizeChanged(const WebCore::IntSize&) { }
 
+#if PLATFORM(MAC)
     virtual void setExposedRect(const WebCore::FloatRect&) = 0;
     virtual WebCore::FloatRect exposedRect() const = 0;
+#endif
     virtual void mainFrameScrollabilityChanged(bool) { }