Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (109815 => 109816)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-06 00:41:54 UTC (rev 109815)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-06 00:45:37 UTC (rev 109816)
@@ -1,3 +1,20 @@
+2012-03-05 Kent Tamura <tk...@chromium.org>
+
+ [Chromium] Add new popup type: PagePopup
+ https://bugs.webkit.org/show_bug.cgi?id=80106
+
+ Reviewed by Darin Fisher.
+
+ This is a preparation of implementing ChromeClient::openPagePopup and
+ closePagePopup.
+
+ * WebKit.gyp: Add WebPagePopup.h and WebPagePopupImpl.cpp.
+ * public/WebPagePopup.h:
+ (WebPagePopup): Add WebPagePopup interface.
+ * public/WebPopupType.h: Add WebPopupTypePage.
+ * src/WebPagePopupImpl.cpp:
+ (WebKit::WebPagePopup::create): Temprary implementation which just returns 0.
+
2012-03-05 Charlie Reis <cr...@chromium.org>
[chromium] Pass WebNavigationPolicy to WebViewClient::createView
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (109815 => 109816)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-06 00:41:54 UTC (rev 109815)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-06 00:45:37 UTC (rev 109816)
@@ -215,6 +215,7 @@
'public/WebNotificationPresenter.h',
'public/WebOptionElement.h',
'public/WebPageOverlay.h',
+ 'public/WebPagePopup.h',
'public/WebPageSerializer.h',
'public/WebPageSerializerClient.h',
'public/WebPageVisibilityState.h',
@@ -615,6 +616,7 @@
'src/WebNodeList.cpp',
'src/WebNotification.cpp',
'src/WebOptionElement.cpp',
+ 'src/WebPagePopupImpl.cpp',
'src/WebPageSerializer.cpp',
'src/WebPageSerializerImpl.cpp',
'src/WebPageSerializerImpl.h',
Copied: trunk/Source/WebKit/chromium/public/WebPagePopup.h (from rev 109815, trunk/Source/WebKit/chromium/public/WebPopupType.h) (0 => 109816)
--- trunk/Source/WebKit/chromium/public/WebPagePopup.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebPagePopup.h 2012-03-06 00:45:37 UTC (rev 109816)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebPagePopup_h
+#define WebPagePopup_h
+
+#include "WebWidget.h"
+#include "platform/WebCommon.h"
+
+namespace WebKit {
+
+class WebWidgetClient;
+
+class WebPagePopup : public WebWidget {
+public:
+ WEBKIT_EXPORT static WebPagePopup* create(WebWidgetClient*);
+};
+
+} // namespace WebKit
+
+#endif
Modified: trunk/Source/WebKit/chromium/public/WebPopupType.h (109815 => 109816)
--- trunk/Source/WebKit/chromium/public/WebPopupType.h 2012-03-06 00:41:54 UTC (rev 109815)
+++ trunk/Source/WebKit/chromium/public/WebPopupType.h 2012-03-06 00:45:37 UTC (rev 109816)
@@ -35,8 +35,9 @@
enum WebPopupType {
WebPopupTypeNone, // Not a popup.
- WebPopupTypeSelect, // A HTML select (combo-box) popup.
+ WebPopupTypeSelect, // An HTML select (combo-box) popup.
WebPopupTypeSuggestion, // An autofill/autocomplete popup.
+ WebPopupTypePage, // An HTML-capable popup.
};
} // namespace WebKit
Copied: trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp (from rev 109815, trunk/Source/WebKit/chromium/public/WebPopupType.h) (0 => 109816)
--- trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp (rev 0)
+++ trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp 2012-03-06 00:45:37 UTC (rev 109816)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "WebPagePopup.h"
+
+namespace WebKit {
+
+// WebPagePopupImpl ----------------------------------------------------------------
+
+// FIXME: WebPagePopupImpl implementation will be written here.
+
+// WebPagePopup ----------------------------------------------------------------
+
+WebPagePopup* WebPagePopup::create(WebWidgetClient*)
+{
+ // FIXME: Returns a WebPagePopupImpl object.
+ return 0;
+}
+
+} // namespace WebKit
Modified: trunk/Tools/ChangeLog (109815 => 109816)
--- trunk/Tools/ChangeLog 2012-03-06 00:41:54 UTC (rev 109815)
+++ trunk/Tools/ChangeLog 2012-03-06 00:45:37 UTC (rev 109816)
@@ -1,3 +1,13 @@
+2012-03-05 Kent Tamura <tk...@chromium.org>
+
+ [Chromium] Add new popup type: PagePopup
+ https://bugs.webkit.org/show_bug.cgi?id=80106
+
+ Reviewed by Darin Fisher.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::createPopupMenu):
+
2012-03-05 Jessie Berlin <jber...@apple.com>
Add myself as a reviewer.
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (109815 => 109816)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-03-06 00:41:54 UTC (rev 109815)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-03-06 00:45:37 UTC (rev 109816)
@@ -255,6 +255,7 @@
{
switch (type) {
case WebKit::WebPopupTypeNone:
+ case WebKit::WebPopupTypePage:
break;
case WebKit::WebPopupTypeSelect:
case WebKit::WebPopupTypeSuggestion:
