Merge WebKit at r64523 : Initial merge by git.

Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4

1 files changed, 11 insertions, 0 deletions

diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index e824381..7f3febf 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -32,12 +33,15 @@
 #define ChromeClientImpl_h
 
 #include "ChromeClientChromium.h"
+#include "PopupMenu.h"
+#include "SearchPopupMenu.h"
 
 namespace WebCore {
 class AccessibilityObject;
 class FileChooser;
 class HTMLParserQuirks;
 class PopupContainer;
+class PopupMenuClient;
 class SecurityOrigin;
 struct WindowFeatures;
 }
@@ -118,6 +122,7 @@ public:
         WebCore::Frame*, const WebCore::String& databaseName);
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
+    virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*);
 #endif
 #if ENABLE(NOTIFICATIONS)
     virtual WebCore::NotificationPresenter* notificationPresenter() const;
@@ -145,7 +150,9 @@ public:
     // Sets a flag to specify that the view needs to be updated, so we need
     // to do an eager layout before the drawing.
     virtual void scheduleCompositingLayerSync();
+#endif
 
+#if USE(GLES2_RENDERING)
     virtual PassOwnPtr<WebCore::GLES2Context> getOnscreenGLES2Context();
     virtual PassOwnPtr<WebCore::GLES2Context> getOffscreenGLES2Context();
 #endif
@@ -165,6 +172,10 @@ public:
     void setCursor(const WebCursorInfo& cursor);
     void setCursorForPlugin(const WebCursorInfo& cursor);
 
+    virtual bool selectItemWritingDirectionIsNatural();
+    virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
+    virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
+
 private:
     void getPopupMenuInfo(WebCore::PopupContainer*, WebPopupMenuInfo*);