tizen beta release

[framework/web/webkit-efl.git] / Source / WebCore / page / Chrome.h

diff --git a/Source/WebCore/page/Chrome.h b/Source/WebCore/page/Chrome.h
index f73351e..dffb9cc 100755 (executable)
--- a/Source/WebCore/page/Chrome.h
+++ b/Source/WebCore/page/Chrome.h
@@ -51,9 +51,6 @@ namespace WebCore {
     class Page;
     class PopupMenu;
     class PopupMenuClient;
-#if ENABLE(NOTIFICATIONS)
-    class NotificationPresenter;
-#endif
     class SearchPopupMenu;
 
     struct FrameLoadRequest;
@@ -69,15 +66,15 @@ namespace WebCore {
 
         // HostWindow methods.
 
-        virtual void invalidateWindow(const IntRect&, bool);
-        virtual void invalidateContentsAndWindow(const IntRect&, bool);
+        virtual void invalidateRootView(const IntRect&, bool) OVERRIDE;
+        virtual void invalidateContentsAndRootView(const IntRect&, bool) OVERRIDE;
         virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
         virtual void scroll(const IntSize&, const IntRect&, const IntRect&);
 #if USE(TILED_BACKING_STORE)
         virtual void delegatedScrollRequested(const IntPoint& scrollPoint);
 #endif
-        virtual IntPoint screenToWindow(const IntPoint&) const;
-        virtual IntRect windowToScreen(const IntRect&) const;
+        virtual IntPoint screenToRootView(const IntPoint&) const OVERRIDE;
+        virtual IntRect rootViewToScreen(const IntRect&) const OVERRIDE;
         virtual PlatformPageClient platformPageClient() const;
         virtual void scrollbarsModeDidChange() const;
         virtual void setCursor(const Cursor&);
@@ -89,6 +86,9 @@ namespace WebCore {
 
         void scrollRectIntoView(const IntRect&) const;
 
+#if ENABLE(TIZEN_SUPPORT_VIEWPORT)
+        bool canContentsSizeChange(Frame*, const IntSize&) const;
+#endif
         void contentsSizeChanged(Frame*, const IntSize&) const;
         void layoutUpdated(Frame*) const;
 
@@ -157,8 +157,8 @@ namespace WebCore {
 
 #if ENABLE(INPUT_COLOR)
         void openColorChooser(ColorChooser*, const Color&);
-        void cleanupColorChooser();
-        void setSelectedColorInColorChooser(const Color&);
+        void cleanupColorChooser(ColorChooser*);
+        void setSelectedColorInColorChooser(ColorChooser*, const Color&);
 #endif
 
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
@@ -167,7 +167,7 @@ namespace WebCore {
         void enumerateChosenDirectory(FileChooser*);
 #endif
 
-        void dispatchViewportDataDidChange(const ViewportArguments&) const;
+        void dispatchViewportPropertiesDidChange(const ViewportArguments&) const;
 
         bool requiresFullscreenForVideoPlayback();
 
@@ -175,10 +175,6 @@ namespace WebCore {
         void focusNSView(NSView*);
 #endif
 
-#if ENABLE(NOTIFICATIONS)
-        NotificationPresenter* notificationPresenter() const; 
-#endif
-
         bool selectItemWritingDirectionIsNatural();
         bool selectItemAlignmentFollowsMenuWritingDirection();
         PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;