Diff
Modified: trunk/ChangeLog (151506 => 151507)
--- trunk/ChangeLog 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/ChangeLog 2013-06-12 17:11:41 UTC (rev 151507)
@@ -1,3 +1,15 @@
+2013-06-12 Alberto Garcia <[email protected]>
+
+ [BlackBerry] Remove dead WebDOM code
+ https://bugs.webkit.org/show_bug.cgi?id=113370
+
+ Reviewed by Anders Carlsson.
+
+ BlackBerry PR 347565
+ Internally reviewed by Charles Wei.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
2013-06-06 Timothy Hatcher <[email protected]>
Add WebInspectorUI to the Makefile.
Modified: trunk/Source/WebCore/ChangeLog (151506 => 151507)
--- trunk/Source/WebCore/ChangeLog 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/WebCore/ChangeLog 2013-06-12 17:11:41 UTC (rev 151507)
@@ -1,3 +1,15 @@
+2013-06-12 Alberto Garcia <[email protected]>
+
+ [BlackBerry] Remove dead WebDOM code
+ https://bugs.webkit.org/show_bug.cgi?id=113370
+
+ Reviewed by Anders Carlsson.
+
+ BlackBerry PR 347565
+ Internally reviewed by Charles Wei.
+
+ * PlatformBlackBerry.cmake:
+
2013-06-12 Daniel Bates <[email protected]>
window.find() case-insensitive search doesn't match diacritical marks
Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (151506 => 151507)
--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-06-12 17:11:41 UTC (rev 151507)
@@ -7,7 +7,6 @@
)
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/bindings/cpp"
"${WEBCORE_DIR}/platform/blackberry/CookieDatabaseBackingStore"
"${WEBCORE_DIR}/platform/graphics/harfbuzz"
"${WEBCORE_DIR}/platform/graphics/opentype/"
@@ -17,10 +16,6 @@
# Other sources
list(APPEND WebCore_SOURCES
- bindings/cpp/WebDOMCString.cpp
- bindings/cpp/WebDOMEventTarget.cpp
- bindings/cpp/WebDOMString.cpp
- bindings/cpp/WebExceptionHandler.cpp
platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.cpp
platform/blackberry/AuthenticationChallengeManager.cpp
platform/blackberry/CookieManager.cpp
@@ -148,26 +143,12 @@
)
endif ()
-# Touch sources
-list(APPEND WebCore_SOURCES
- dom/Touch.cpp
- dom/TouchEvent.cpp
- dom/TouchList.cpp
-)
-
if (ENABLE_SMOOTH_SCROLLING)
list(APPEND WebCore_SOURCES
platform/blackberry/ScrollAnimatorBlackBerry.cpp
)
endif ()
-list(APPEND WEBDOM_IDL_HEADERS
- bindings/cpp/WebDOMCString.h
- bindings/cpp/WebDOMEventTarget.h
- bindings/cpp/WebDOMObject.h
- bindings/cpp/WebDOMString.h
-)
-
if (ENABLE_REQUEST_ANIMATION_FRAME)
list(APPEND WebCore_SOURCES
platform/graphics/blackberry/DisplayRefreshMonitorBlackBerry.cpp
@@ -258,58 +239,6 @@
add_definitions(-DPUBLIC_BUILD=$ENV{PUBLIC_BUILD})
endif ()
-install(FILES ${WEBDOM_IDL_HEADERS} DESTINATION usr/include/browser/webkit/dom)
-
-# Create DOM C++ code given an IDL input
-# We define a new list of feature defines that is prefixed with LANGUAGE_CPP=1 so as to avoid the
-# warning "missing whitespace after the macro name" when inlining "LANGUAGE_CPP=1 ${FEATURE_DEFINES}".
-set(FEATURE_DEFINES_WEBCORE "LANGUAGE_CPP=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
-
-# FIXME: We need to add the IDLs for SQL storage and Web Workers. See PR #123484.
-set(WebCore_NO_CPP_IDL_FILES
- ${WebCore_SVG_IDL_FILES}
- dom/CustomEvent.idl
- dom/PopStateEvent.idl
- inspector/ScriptProfile.idl
- inspector/ScriptProfileNode.idl
-)
-
-list(APPEND WebCore_IDL_FILES
- css/MediaQueryListListener.idl
-)
-
-set(WebCore_CPP_IDL_FILES ${WebCore_IDL_FILES})
-
-foreach (_file ${WebCore_NO_CPP_IDL_FILES})
- string(REPLACE "${_file}" "" WebCore_CPP_IDL_FILES "${WebCore_CPP_IDL_FILES}")
-endforeach ()
-
-set(WebCore_CPP_IDL_FILES
- dom/EventListener.idl
- "${WebCore_CPP_IDL_FILES}"
-)
-
-foreach (_idl ${WebCore_CPP_IDL_FILES})
- set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
-endforeach ()
-file(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
-
-add_custom_command(
- OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERCONTEXT_CONSTRUCTORS_FILE}
- DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_RESOLVE_SUPPLEMENTAL} ${WebCore_CPP_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerContextConstructorsFile ${WORKERCONTEXT_CONSTRUCTORS_FILE}
- VERBATIM)
-
-GENERATE_BINDINGS(WebCore_SOURCES
- "${WebCore_CPP_IDL_FILES}"
- "${WEBCORE_DIR}"
- "${IDL_INCLUDES}"
- "${FEATURE_DEFINES_WEBCORE}"
- ${DERIVED_SOURCES_WEBCORE_DIR} WebDOM CPP
- ${SUPPLEMENTAL_DEPENDENCY_FILE}
- ${WINDOW_CONSTRUCTORS_FILE}
- ${WORKERCONTEXT_CONSTRUCTORS_FILE})
-
# Generate contents for PopupPicker.cpp
set(WebCore_POPUP_CSS_AND_JS
${WEBCORE_DIR}/Resources/blackberry/popupControlBlackBerry.css
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (151506 => 151507)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-12 17:11:41 UTC (rev 151507)
@@ -139,9 +139,6 @@
#endif
#include "VisiblePosition.h"
#include "WebCookieJar.h"
-#if ENABLE(WEBDOM)
-#include "WebDOMDocument.h"
-#endif
#include "WebKitThreadViewportAccessor.h"
#include "WebKitVersion.h"
#include "WebOverlay.h"
@@ -4870,73 +4867,6 @@
d->m_page->group().addVisitedLink(url, length);
}
-#if ENABLE(WEBDOM)
-WebDOMDocument WebPage::document() const
-{
- if (!d->m_mainFrame)
- return WebDOMDocument();
- return WebDOMDocument(d->m_mainFrame->document());
-}
-
-WebDOMNode WebPage::nodeAtDocumentPoint(const Platform::IntPoint& documentPoint)
-{
- HitTestResult result = d->m_mainFrame->eventHandler()->hitTestResultAtPoint(WebCore::IntPoint(documentPoint));
- Node* node = result.innerNonSharedNode();
- return WebDOMNode(node);
-}
-
-bool WebPage::getNodeRect(const WebDOMNode& node, Platform::IntRect& result)
-{
- Node* nodeImpl = node.impl();
- if (nodeImpl && nodeImpl->renderer()) {
- result = nodeImpl->getRect();
- return true;
- }
-
- return false;
-}
-
-bool WebPage::setNodeFocus(const WebDOMNode& node, bool on)
-{
- Node* nodeImpl = node.impl();
-
- if (nodeImpl && nodeImpl->isFocusable()) {
- Document* doc = nodeImpl->document();
- if (Page* page = doc->page()) {
- // Modify if focusing on node or turning off focused node.
- if (on) {
- page->focusController()->setFocusedElement(toElement(nodeImpl), doc->frame());
- if (nodeImpl->isElementNode())
- toElement(nodeImpl)->updateFocusAppearance(true);
- d->m_inputHandler->didNodeOpenPopup(nodeImpl);
- } else if (doc->focusedElement() == nodeImpl) // && !on
- page->focusController()->setFocusedElement(0, doc->frame());
-
- return true;
- }
- }
- return false;
-}
-
-bool WebPage::setNodeHovered(const WebDOMNode& node, bool on)
-{
- if (Node* nodeImpl = node.impl()) {
- nodeImpl->setHovered(on);
- return true;
- }
- return false;
-}
-
-bool WebPage::nodeHasHover(const WebDOMNode& node)
-{
- if (Node* nodeImpl = node.impl()) {
- if (RenderStyle* style = nodeImpl->renderStyle())
- return style->affectedByHoverRules();
- }
- return false;
-}
-#endif
-
void WebPage::initPopupWebView(BlackBerry::WebKit::WebPage* webPage)
{
d->m_pagePopup->initialize(webPage);
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (151506 => 151507)
--- trunk/Source/WebKit/blackberry/Api/WebPage.h 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h 2013-06-12 17:11:41 UTC (rev 151507)
@@ -302,15 +302,6 @@
void addVisitedLink(const unsigned short* url, unsigned length);
-#if defined(ENABLE_WEBDOM) && ENABLE_WEBDOM
- WebDOMDocument document() const;
- WebDOMNode nodeAtDocumentPoint(const Platform::IntPoint&);
- bool getNodeRect(const WebDOMNode&, Platform::IntRect& result);
- bool setNodeFocus(const WebDOMNode&, bool on);
- bool setNodeHovered(const WebDOMNode&, bool on);
- bool nodeHasHover(const WebDOMNode&);
-#endif
-
bool defersLoading() const;
bool isEnableLocalAccessToAllCookies() const;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (151506 => 151507)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-06-12 17:11:41 UTC (rev 151507)
@@ -1,3 +1,18 @@
+2013-06-12 Alberto Garcia <[email protected]>
+
+ [BlackBerry] Remove dead WebDOM code
+ https://bugs.webkit.org/show_bug.cgi?id=113370
+
+ Reviewed by Anders Carlsson.
+
+ BlackBerry PR 347565
+ Internally reviewed by Charles Wei.
+
+ * Api/WebPage.cpp:
+ * Api/WebPage.h:
+ * WebCoreSupport/AboutDataEnableFeatures.in:
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+
2013-06-12 Jakob Petsovits <[email protected]>
[BlackBerry] Smarter algorithm to determine the backingstore rect
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (151506 => 151507)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2013-06-12 17:11:41 UTC (rev 151507)
@@ -220,7 +220,6 @@
VIEWPORT_REFLOW
VIEW_MODE_CSS_MEDIA
VMINSPECTOR
-WEBDOM
WEBGL
WEBKIT2
WEBVTT_REGIONS
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (151506 => 151507)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-06-12 17:11:41 UTC (rev 151507)
@@ -60,9 +60,6 @@
#include "SharedBuffer.h"
#include "TextEncoding.h"
#include "TouchEventHandler.h"
-#if ENABLE(WEBDOM)
-#include "WebDOMDocument.h"
-#endif
#include "WebPageClient.h"
#include <BlackBerryPlatformExecutableMessage.h>
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (151506 => 151507)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2013-06-12 17:01:00 UTC (rev 151506)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2013-06-12 17:11:41 UTC (rev 151507)
@@ -26,7 +26,6 @@
add_definitions(-DBLACKBERRY_PLATFORM_GRAPHICS_EGL=1)
add_definitions(-DBLACKBERRY_PLATFORM_GRAPHICS_GLES2=1)
add_definitions(-DBLACKBERRY_PLATFORM_GRAPHICS_DRAWING_SURFACE=1)
- add_definitions(-DBLACKBERRY_PLATFORM_EXPORT_WEBDOM=1)
add_definitions(-DWTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER=1)
endif ()
