Changeset 147749 in webkit
- Timestamp:
- Apr 5, 2013 8:49:35 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 deleted
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r147748 r147749 1 2013-04-05 Ryosuke Niwa <rniwa@webkit.org> 2 3 Remove Chromium code from WebCore/page 4 https://bugs.webkit.org/show_bug.cgi?id=114013 5 6 Reviewed by Anders Carlsson. 7 8 Removed. 9 10 * page/Console.cpp: 11 (WebCore::Console::time): 12 (WebCore::Console::timeEnd): 13 * page/EventHandler.cpp: 14 (WebCore::shouldGesturesTriggerActive): 15 (WebCore::EventHandler::handleMouseReleaseEvent): 16 (WebCore): 17 (WebCore::EventHandler::sendScrollEventToView): 18 * page/FeatureObserver.cpp: 19 (WebCore::FeatureObserver::updateMeasurements): 20 * page/FrameView.cpp: 21 (WebCore::FrameView::layout): 22 (WebCore::FrameView::useSlowRepaints): 23 * page/PageConsole.cpp: 24 * page/PageGroup.cpp: 25 (WebCore::PageGroup::isLinkVisited): 26 (WebCore::PageGroup::addVisitedLink): 27 * page/Settings.cpp: 28 (WebCore): 29 * page/android: Removed. 30 * page/chromium: Removed. 31 * page/chromium/ChromeClientChromium.h: Removed. 32 * page/chromium/DragControllerChromium.cpp: Removed. 33 * page/chromium/EventHandlerChromium.cpp: Removed. 34 * page/scrolling/ScrollingCoordinator.cpp: 35 (WebCore::ScrollingCoordinator::create): 36 (WebCore): 37 * page/scrolling/ScrollingCoordinator.h: 38 (ScrollingCoordinator): 39 * page/scrolling/ScrollingTree.cpp: 40 (WebCore): 41 * page/scrolling/ScrollingTree.h: 42 (ScrollingTree): 43 * page/scrolling/chromium: Removed. 44 * page/scrolling/chromium/ScrollingCoordinatorChromium.cpp: Removed. 45 * page/scrolling/chromium/ScrollingCoordinatorChromium.h: Removed. 46 1 47 2013-04-05 Ryosuke Niwa <rniwa@webkit.org> 2 48 -
trunk/Source/WebCore/page/Console.cpp
r146208 r147749 57 57 #include <wtf/text/WTFString.h> 58 58 59 #if PLATFORM(CHROMIUM)60 #include "TraceEvent.h"61 #endif62 63 59 namespace WebCore { 64 60 … … 232 228 { 233 229 InspectorInstrumentation::startConsoleTiming(m_frame, title); 234 #if PLATFORM(CHROMIUM)235 TRACE_EVENT_COPY_ASYNC_BEGIN0("webkit", title.utf8().data(), this);236 #endif237 230 } 238 231 239 232 void Console::timeEnd(ScriptState* state, const String& title) 240 233 { 241 #if PLATFORM(CHROMIUM)242 TRACE_EVENT_COPY_ASYNC_END0("webkit", title.utf8().data(), this);243 #endif244 234 RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(state)); 245 235 InspectorInstrumentation::stopConsoleTiming(m_frame, title, callStack.release()); -
trunk/Source/WebCore/page/EventHandler.cpp
r147739 r147749 288 288 // rely on them to set the active state. Unfortunately there's no generic way to 289 289 // know in advance what event types are supported. 290 #if PLATFORM(CHROMIUM)291 return true;292 #else293 290 return false; 294 #endif295 291 } 296 292 #endif … … 1941 1937 1942 1938 bool contextMenuEvent = mouseEvent.button() == RightButton; 1943 #if PLATFORM(CHROMIUM) && OS(DARWIN)1944 // FIXME: The Mac port achieves the same behavior by checking whether the context menu is currently open in WebPage::mouseEvent(). Consider merging the implementations.1945 if (mouseEvent.button() == LeftButton && mouseEvent.modifiers() & PlatformEvent::CtrlKey)1946 contextMenuEvent = true;1947 #endif1948 1939 1949 1940 bool swallowClickEvent = m_clickCount > 0 && !contextMenuEvent && mouseIsReleasedOnPressedElement(mev.targetNode(), m_clickNode.get()) && !dispatchMouseEvent(eventNames().clickEvent, mev.targetNode(), true, m_clickCount, mouseEvent, true); … … 2401 2392 } 2402 2393 2403 #if !PLATFORM(GTK) && !(PLATFORM(CHROMIUM) && (OS(UNIX) && !OS(DARWIN)))2394 #if !PLATFORM(GTK) 2404 2395 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&, const PlatformWheelEvent&) const 2405 2396 { … … 2824 2815 ScrollByPixelWheelEvent, 2825 2816 gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey()); 2826 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)2817 #if PLATFORM(MAC) 2827 2818 syntheticWheelEvent.setHasPreciseScrollingDeltas(true); 2828 2819 #endif -
trunk/Source/WebCore/page/FeatureObserver.cpp
r147260 r147749 50 50 void FeatureObserver::updateMeasurements() 51 51 { 52 #if PLATFORM(CHROMUM)53 HistogramSupport::histogramEnumeration("WebCore.FeatureObserver", PageVisits, NumberOfFeatures);54 #endif55 56 52 if (!m_featureBits) 57 53 return; 58 59 #if PLATFORM(CHROMUM)60 for (unsigned i = 0; i < NumberOfFeatures; ++i) {61 if (m_featureBits->quickGet(i))62 HistogramSupport::histogramEnumeration("WebCore.FeatureObserver", i, NumberOfFeatures);63 }64 #endif65 54 66 55 // Clearing feature bits is timing sensitive. Ports other than chromium do not use HistogramSupport, -
trunk/Source/WebCore/page/FrameView.cpp
r147739 r147749 95 95 #endif 96 96 97 #if PLATFORM(CHROMIUM)98 #include "TraceEvent.h"99 #endif100 101 97 namespace WebCore { 102 98 … … 1111 1107 return; 1112 1108 1113 #if PLATFORM(CHROMIUM)1114 TRACE_EVENT0("webkit", "FrameView::layout");1115 #endif1116 1117 1109 // Protect the view from being deleted during layout (in recalcStyle) 1118 1110 RefPtr<FrameView> protector(this); … … 1336 1328 m_layoutCount++; 1337 1329 1338 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)1330 #if PLATFORM(MAC) 1339 1331 if (AXObjectCache* cache = root->document()->existingAXObjectCache()) 1340 1332 cache->postNotification(root, AXObjectCache::AXLayoutComplete, true); … … 1473 1465 if (contentsInCompositedLayer() && !platformWidget()) 1474 1466 return mustBeSlow; 1475 1476 #if PLATFORM(CHROMIUM)1477 // The chromium compositor does not support scrolling a non-composited frame within a composited page through1478 // the fast scrolling path, so force slow scrolling in that case.1479 if (m_frame->ownerElement() && !hasCompositedContent() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent())1480 return true;1481 #endif1482 1467 1483 1468 bool isOverlapped = m_isOverlapped && considerOverlap; -
trunk/Source/WebCore/page/PageConsole.cpp
r146353 r147749 50 50 #include <wtf/text/WTFString.h> 51 51 52 #if PLATFORM(CHROMIUM)53 #include "TraceEvent.h"54 #endif55 56 52 namespace WebCore { 57 53 -
trunk/Source/WebCore/page/PageGroup.cpp
r145826 r147749 47 47 #endif 48 48 49 #if PLATFORM(CHROMIUM)50 #include "VisitedLinks.h"51 #endif52 53 49 namespace WebCore { 54 50 … … 196 192 bool PageGroup::isLinkVisited(LinkHash visitedLinkHash) 197 193 { 198 #if PLATFORM(CHROMIUM)199 // Use Chromium's built-in visited link database.200 return VisitedLinks::isLinkVisited(visitedLinkHash);201 #else202 194 if (!m_visitedLinksPopulated) { 203 195 m_visitedLinksPopulated = true; … … 206 198 } 207 199 return m_visitedLinkHashes.contains(visitedLinkHash); 208 #endif209 200 } 210 201 … … 218 209 { 219 210 ASSERT(shouldTrackVisitedLinks); 220 #if !PLATFORM(CHROMIUM)221 211 if (!m_visitedLinkHashes.add(hash).isNewEntry) 222 212 return; 223 #endif224 213 Page::visitedStateChanged(this, hash); 225 214 pageCache()->markPagesForVistedLinkStyleRecalc(); -
trunk/Source/WebCore/page/Settings.cpp
r146924 r147749 113 113 114 114 // NOTEs 115 // 1) EditingMacBehavior comprises Tiger, Leopard, SnowLeopard and iOS builds, as well QtWebKit and Chromiumwhen built on Mac;115 // 1) EditingMacBehavior comprises Tiger, Leopard, SnowLeopard and iOS builds, as well as QtWebKit when built on Mac; 116 116 // 2) EditingWindowsBehavior comprises Win32 and WinCE builds, as well as QtWebKit and Chromium when built on Windows; 117 117 // 3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS/Android (and then abusing the terminology); 118 118 // 4) EditingAndroidBehavior comprises Android builds. 119 // 99) MacEditingBehavior is used a fallback.119 // 99) MacEditingBehavior is used as a fallback. 120 120 static EditingBehaviorType editingBehaviorTypeForPlatform() 121 121 { … … 142 142 static const bool defaultUnifiedTextCheckerEnabled = false; 143 143 #endif 144 #if PLATFORM(CHROMIUM)145 #if OS(MAC_OS_X)146 static const bool defaultSmartInsertDeleteEnabled = true;147 #else148 static const bool defaultSmartInsertDeleteEnabled = false;149 #endif150 #if OS(WINDOWS)151 static const bool defaultSelectTrailingWhitespaceEnabled = true;152 #else153 static const bool defaultSelectTrailingWhitespaceEnabled = false;154 #endif155 #else156 144 static const bool defaultSmartInsertDeleteEnabled = true; 157 145 static const bool defaultSelectTrailingWhitespaceEnabled = false; 158 #endif159 146 160 147 Settings::Settings(Page* page) -
trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
r146478 r147749 49 49 #endif 50 50 51 #if PLATFORM(CHROMIUM)52 #include "ScrollingCoordinatorChromium.h"53 #endif54 55 51 #if USE(COORDINATED_GRAPHICS) 56 52 #include "ScrollingCoordinatorCoordinatedGraphics.h" … … 67 63 #if USE(ACCELERATED_COMPOSITING) && ENABLE(THREADED_SCROLLING) 68 64 return adoptRef(new ScrollingCoordinatorMac(page)); 69 #endif70 71 #if PLATFORM(CHROMIUM)72 return adoptRef(new ScrollingCoordinatorChromium(page));73 65 #endif 74 66 … … 413 405 } 414 406 415 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))407 #if PLATFORM(MAC) 416 408 void ScrollingCoordinator::handleWheelEventPhase(PlatformWheelEventPhase phase) 417 409 { -
trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h
r147163 r147749 104 104 virtual bool supportsFixedPositionLayers() const { return false; } 105 105 106 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))106 #if PLATFORM(MAC) 107 107 // Dispatched by the scrolling tree during handleWheelEvent. This is required as long as scrollbars are painted on the main thread. 108 108 void handleWheelEventPhase(PlatformWheelEventPhase); -
trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp
r143418 r147749 259 259 } 260 260 261 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))261 #if PLATFORM(MAC) 262 262 void ScrollingTree::handleWheelEventPhase(PlatformWheelEventPhase phase) 263 263 { -
trunk/Source/WebCore/page/scrolling/ScrollingTree.h
r143418 r147749 91 91 IntPoint mainFrameScrollPosition(); 92 92 93 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))93 #if PLATFORM(MAC) 94 94 void handleWheelEventPhase(PlatformWheelEventPhase); 95 95 #endif
Note: See TracChangeset
for help on using the changeset viewer.