summaryrefslogtreecommitdiffstats
path: root/webkit/api/public
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/api/public')
-rw-r--r--webkit/api/public/WebCompositionCommand.h8
-rw-r--r--webkit/api/public/WebNavigationPolicy.h12
-rw-r--r--webkit/api/public/WebPopupMenu.h11
-rw-r--r--webkit/api/public/WebTextDirection.h10
-rw-r--r--webkit/api/public/WebWidget.h16
-rw-r--r--webkit/api/public/WebWidgetClient.h39
6 files changed, 44 insertions, 52 deletions
diff --git a/webkit/api/public/WebCompositionCommand.h b/webkit/api/public/WebCompositionCommand.h
index d7acbfd..a7be66c 100644
--- a/webkit/api/public/WebCompositionCommand.h
+++ b/webkit/api/public/WebCompositionCommand.h
@@ -1,10 +1,10 @@
/*
* 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
@@ -14,7 +14,7 @@
* * 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
@@ -31,8 +31,6 @@
#ifndef WebCompositionCommand_h
#define WebCompositionCommand_h
-#error "This header file is still a work in progress; do not include!"
-
namespace WebKit {
enum WebCompositionCommand {
diff --git a/webkit/api/public/WebNavigationPolicy.h b/webkit/api/public/WebNavigationPolicy.h
index 707f56d..14f72da 100644
--- a/webkit/api/public/WebNavigationPolicy.h
+++ b/webkit/api/public/WebNavigationPolicy.h
@@ -1,10 +1,10 @@
/*
* 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
@@ -14,7 +14,7 @@
* * 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
@@ -31,8 +31,6 @@
#ifndef WebNavigationPolicy_h
#define WebNavigationPolicy_h
-#error "This header file is still a work in progress; do not include!"
-
namespace WebKit {
enum WebNavigationPolicy {
@@ -41,8 +39,8 @@ namespace WebKit {
WebNavigationPolicyCurrentTab,
WebNavigationPolicyNewBackgroundTab,
WebNavigationPolicyNewForegroundTab,
- WebNavigationPolicyNewForegroundTabInNewWindow,
- WebNavigationPolicyNewPopupWindow,
+ WebNavigationPolicyNewWindow,
+ WebNavigationPolicyNewPopup,
};
} // namespace WebKit
diff --git a/webkit/api/public/WebPopupMenu.h b/webkit/api/public/WebPopupMenu.h
index 521ecec..65f2cc4 100644
--- a/webkit/api/public/WebPopupMenu.h
+++ b/webkit/api/public/WebPopupMenu.h
@@ -1,10 +1,10 @@
/*
* 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
@@ -14,7 +14,7 @@
* * 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
@@ -31,12 +31,11 @@
#ifndef WebPopupMenu_h
#define WebPopupMenu_h
-#error "This header file is still a work in progress; do not include!"
-
#include "WebCommon.h"
#include "WebWidget.h"
namespace WebKit {
+ class WebWidgetClient;
class WebPopupMenu : public WebWidget {
public:
@@ -44,3 +43,5 @@ namespace WebKit {
};
} // namespace WebKit
+
+#endif
diff --git a/webkit/api/public/WebTextDirection.h b/webkit/api/public/WebTextDirection.h
index 8136402..901a700 100644
--- a/webkit/api/public/WebTextDirection.h
+++ b/webkit/api/public/WebTextDirection.h
@@ -1,10 +1,10 @@
/*
* 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
@@ -14,7 +14,7 @@
* * 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
@@ -31,13 +31,11 @@
#ifndef WebTextDirection_h
#define WebTextDirection_h
-#error "This header file is still a work in progress; do not include!"
-
namespace WebKit {
// Represents text directions (or writing directions) of a DOM node.
enum WebTextDirection {
- WebTextDirectionDefault,
+ WebTextDirectionDefault, // Natural writing direction ("inherit")
WebTextDirectionLeftToRight,
WebTextDirectionRightToLeft,
};
diff --git a/webkit/api/public/WebWidget.h b/webkit/api/public/WebWidget.h
index 30f0601..262ac79 100644
--- a/webkit/api/public/WebWidget.h
+++ b/webkit/api/public/WebWidget.h
@@ -1,10 +1,10 @@
/*
* 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
@@ -14,7 +14,7 @@
* * 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
@@ -31,12 +31,16 @@
#ifndef WebWidget_h
#define WebWidget_h
-#error "This header file is still a work in progress; do not include!"
-
+#include "WebCanvas.h"
#include "WebCommon.h"
+#include "WebCompositionCommand.h"
#include "WebTextDirection.h"
namespace WebKit {
+ class WebInputEvent;
+ class WebString;
+ struct WebRect;
+ struct WebSize;
class WebWidget {
public:
@@ -63,7 +67,7 @@ namespace WebKit {
// Called to inform the WebWidget of an input event. Returns true if
// the event has been processed, false otherwise.
- virtual void handleInputEvent(const WebInputEvent&) = 0;
+ virtual bool handleInputEvent(const WebInputEvent&) = 0;
// Called to inform the WebWidget that mouse capture was lost.
virtual void mouseCaptureLost() = 0;
diff --git a/webkit/api/public/WebWidgetClient.h b/webkit/api/public/WebWidgetClient.h
index 02815e7..7ac0a6a 100644
--- a/webkit/api/public/WebWidgetClient.h
+++ b/webkit/api/public/WebWidgetClient.h
@@ -1,10 +1,10 @@
/*
* 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
@@ -14,7 +14,7 @@
* * 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
@@ -31,63 +31,56 @@
#ifndef WebWidgetClient_h
#define WebWidgetClient_h
-#error "This header file is still a work in progress; do not include!"
-
#include "WebCommon.h"
#include "WebNavigationPolicy.h"
namespace WebKit {
class WebWidget;
struct WebCursorInfo;
- struct WebPluginGeometry;
struct WebRect;
struct WebScreenInfo;
class WebWidgetClient {
public:
// Called when a region of the WebWidget needs to be re-painted.
- virtual void didInvalidateRect(WebWidget*, const WebRect&) = 0;
+ virtual void didInvalidateRect(const WebRect&) = 0;
// Called when a region of the WebWidget, given by clipRect, should be
// scrolled by the specified dx and dy amounts.
- virtual void didScrollRect(WebWidget*, int dx, int dy, const WebRect& clipRect) = 0;
-
- // Called when a plugin is moved relative to its containing window.
- // This typically happens as a result of scrolling the page.
- virtual void didMovePlugin(WebWidget*, const WebPluginGeometry&) = 0;
+ virtual void didScrollRect(int dx, int dy, const WebRect& clipRect) = 0;
// Called when the widget acquires or loses focus, respectively.
- virtual void didFocus(WebWidget*) = 0;
- virtual void didBlur(WebWidget*) = 0;
+ virtual void didFocus() = 0;
+ virtual void didBlur() = 0;
// Called when the cursor for the widget changes.
- virtual void didChangeCursor(WebWidget*, const WebCursorInfo&) = 0;
+ virtual void didChangeCursor(const WebCursorInfo&) = 0;
// Called when the widget should be closed. WebWidget::close() should
// be called asynchronously as a result of this notification.
- virtual void closeWidgetSoon(WebWidget*) = 0;
+ virtual void closeWidgetSoon() = 0;
// Called to show the widget according to the given policy.
- virtual void show(WebWidget*, WebNavigationPolicy) = 0;
+ virtual void show(WebNavigationPolicy) = 0;
// Called to block execution of the current thread until the widget is
// closed.
- virtual void runModal(WebWidget*) = 0;
+ virtual void runModal() = 0;
// Called to get/set the position of the widget in screen coordinates.
- virtual WebRect windowRect(WebWidget*) = 0;
- virtual void setWindowRect(WebWidget*, const WebRect&) = 0;
+ virtual WebRect windowRect() = 0;
+ virtual void setWindowRect(const WebRect&) = 0;
// Called to get the position of the resizer rect in window coordinates.
- virtual WebRect windowResizerRect(WebWidget*) = 0;
+ virtual WebRect windowResizerRect() = 0;
// Called to get the position of the root window containing the widget
// in screen coordinates.
- virtual WebRect rootWindowRect(WebWidget*) = 0;
+ virtual WebRect rootWindowRect() = 0;
// Called to query information about the screen where this widget is
// displayed.
- virtual WebScreenInfo screenInfo(WebWidget*) = 0;
+ virtual WebScreenInfo screenInfo() = 0;
};
} // namespace WebKit
generated by cgit v1.1 at 2025-01-30 22:09:37 +0000