X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Floader%2FEmptyClients.h;h=8b8d49b641eec35fa694616d56395f027e1bdf5c;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=2da5eaaa47d9a6e3824c831ba8cdef7f69718c46;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/core/loader/EmptyClients.h b/src/third_party/WebKit/Source/core/loader/EmptyClients.h
index 2da5eaa..8b8d49b 100644
--- a/src/third_party/WebKit/Source/core/loader/EmptyClients.h
+++ b/src/third_party/WebKit/Source/core/loader/EmptyClients.h
@@ -62,7 +62,7 @@
  Brittle, yes.  Unfortunate, yes.  Hopefully temporary.
 */
 
-namespace WebCore {
+namespace blink {
 
 class EmptyChromeClient : public ChromeClient {
     WTF_MAKE_FAST_ALLOCATED;
@@ -128,7 +128,7 @@ public:
 
     virtual void invalidateContentsAndRootView(const IntRect&) OVERRIDE { }
     virtual void invalidateContentsForSlowScroll(const IntRect&) OVERRIDE { }
-    virtual void scroll(const IntSize&, const IntRect&, const IntRect&) OVERRIDE { }
+    virtual void scroll() OVERRIDE { }
     virtual void scheduleAnimation() OVERRIDE { }
 
     virtual IntRect rootViewToScreen(const IntRect& r) const OVERRIDE { return r; }
@@ -190,7 +190,7 @@ public:
     virtual void dispatchDidHandleOnloadEvents() OVERRIDE { }
     virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() OVERRIDE { }
     virtual void dispatchWillClose() OVERRIDE { }
-    virtual void dispatchDidStartProvisionalLoad() OVERRIDE { }
+    virtual void dispatchDidStartProvisionalLoad(bool isTransitionNavigation) OVERRIDE { }
     virtual void dispatchDidReceiveTitle(const String&) OVERRIDE { }
     virtual void dispatchDidChangeIcons(IconType) OVERRIDE { }
     virtual void dispatchDidCommitLoad(LocalFrame*, HistoryItem*, HistoryCommitType) OVERRIDE { }
@@ -201,7 +201,7 @@ public:
     virtual void dispatchDidFirstVisuallyNonEmptyLayout() OVERRIDE { }
     virtual void dispatchDidChangeThemeColor() OVERRIDE { };
 
-    virtual NavigationPolicy decidePolicyForNavigation(const ResourceRequest&, DocumentLoader*, NavigationPolicy) OVERRIDE;
+    virtual NavigationPolicy decidePolicyForNavigation(const ResourceRequest&, DocumentLoader*, NavigationPolicy, bool isTransitionNavigation) OVERRIDE;
 
     virtual void dispatchWillSendSubmitEvent(HTMLFormElement*) OVERRIDE;
     virtual void dispatchWillSubmitForm(HTMLFormElement*) OVERRIDE;
@@ -248,8 +248,10 @@ public:
     virtual PassOwnPtr<blink::WebApplicationCacheHost> createApplicationCacheHost(blink::WebApplicationCacheHostClient*) OVERRIDE;
 };
 
-class EmptyTextCheckerClient FINAL : public TextCheckerClient {
+class EmptyTextCheckerClient : public TextCheckerClient {
 public:
+    ~EmptyTextCheckerClient() { }
+
     virtual bool shouldEraseMarkersAfterChangeSelection(TextCheckingType) const OVERRIDE { return true; }
     virtual void checkSpellingOfString(const String&, int*, int*) OVERRIDE { }
     virtual String getAutoCorrectSuggestionForMisspelledWord(const String&) OVERRIDE { return String(); }
@@ -257,7 +259,7 @@ public:
     virtual void requestCheckingOfString(PassRefPtr<TextCheckingRequest>) OVERRIDE;
 };
 
-class EmptySpellCheckerClient FINAL : public SpellCheckerClient {
+class EmptySpellCheckerClient : public SpellCheckerClient {
     WTF_MAKE_NONCOPYABLE(EmptySpellCheckerClient); WTF_MAKE_FAST_ALLOCATED;
 public:
     EmptySpellCheckerClient() { }
@@ -307,7 +309,7 @@ public:
     EmptyDragClient() { }
     virtual ~EmptyDragClient() {}
     virtual DragDestinationAction actionMaskForDrag(DragData*) OVERRIDE { return DragDestinationActionNone; }
-    virtual void startDrag(DragImage*, const IntPoint&, const IntPoint&, Clipboard*, LocalFrame*, bool) OVERRIDE { }
+    virtual void startDrag(DragImage*, const IntPoint&, const IntPoint&, DataTransfer*, LocalFrame*, bool) OVERRIDE { }
 };
 
 class EmptyInspectorClient FINAL : public InspectorClient {